Saving now works correctly