Updated Save Method