Redesign [part4] Final version