Improved pause/resume