Mega commit for new design.