UX Logic changes