AG8: improve risk management