MarkL's QuickSave changes

Fixed pull request for Quick Save changes from MarkL