light refactoring, bump turn # on move