Added a client side timeout of 20s to avoid heroku timeouts