Still need to chane heuristics
Pushing submitted version of code