CMB2 Upgrade - #72