Updated risk calculation