implemented new design