#update - refactor model saving