Pause refactor