fixing up UX part I