reworked all the hazard logic