Changed Timeout mechanism which was failing