Change return in saving functions - cloned