updated ux logic