Working on improving save states