Pause options added back in
Merge branch 'pim'