simplified code, removed bad features
Hard baseline... done