more changes to make it fit in new MA terminology