Removed duplication, fixed pausing after resuming