now also detecting normal moves correctly