modified to accomodate the MAAS 2.0