refactored continued playback handling