Redesign [part3]