updating hatch catch code