Improved pause functionality