Variations using knn.
Merge branch 'develop'