Refactor keep moving.