Working on hazard generation
Merge origin/master