tried new calculation method in hazard.rb also,  removed unused fields from hazard.rb