Improved calculate_risk_actual