changed hazards a bit

ready to push to master