refactor continued (moves)