Modify the timeout mechanism