Fixed merge, added CSPause back in