added pre-save verification