tweaked save method a little bit