Update of branch Hazard-and-risk

This is a wrong way pull request.
I'm going through with it, to update the branch