Update save method to a better version