Heuristic improved
(Movements must be fixed)