some safeguards added