Some more progress on pause and play