Beginning of gen-m redesign.