[PATCH 16/20] Mapped CM-6 (significant change)