implemented new design v.2.1