Reworked save and update