More manager layer patches