Changed method for saving to reduce datastore writes