Added ability to pause afterSave