another intermediate version of recommender
fixing merge conflicts