Attempt CMF 1.1 upgrade pt2