added some precautions