some changes waiter