Main redesign in place