dmm design and other fix