Combined units

Pulled risk analysis into risk management unit, for clarity