Modify the Design

Complete and Continue