part 1 new design.
redesign part 2