added bigger wait timeouts