Modified timeouts, new timeout is 20