Updating how waiters work