Modified timeout as per Senior Engineer instructions