moved expiration date to save function