Changed order in DoMove and UndoMove