changed order of features