changes
clean again
nice
added waiter