Almost complete redesign