add hazard funtionality