Fix the incrementation of the moves. Refactor.