Updated server to timeout in 60 seconds instead of 2 seconds