Rearange to match CM repos Pt2