Redesign. part 1
Redesign. part 2