Added waiter UI functions