Implementing redesign v.2