Jymin changes for auto-save