Small changes. Trying to figure how to do the save correctly.