Redesign [part2]