Make initial implementation work more or less on various datasets
Working for every dataset