#22 - Started improvement of pausing