CountMoveSpaces updated