Added mco modifications for 2.2.2