Save method updated