merging darios changes to HazardPath