waiter namespace
correcting bug