Design refinement

shape