Update to remove bugs in save