Re-worked saving again