Complete rethink and redesign