Always save before you commit