Further configuration of new M1 logic