Updating for new waiter system