Changed the feature set slightly; now the results are a bit better