Fix pausing issue, remove promises of modes