Changed Waiter to not use Timeout