Adding better saving