Move this to just before you call save