Modified the UX