Fixed up customer to include waiting