Progressive update with mw_2_3 control code additions.