now supports save resumption