Changes to allign with Aegis requirements