changes according to new UX