This needs to come just before you call save