Continued work on Momento Saving