incorporated dylan's changes to saves!!!