[TASK] Change the way pausing works