bug fix and changes in risk calculation for cameral