Pause system enhancement & refactor (WIP)
Pause system enhancement & refactor done