Update waiter code based on feedback