Changed save method