Apply Simon's changes (more different kinds of features).