Implemented new design