Updated Save Logic