Change behaviour to call the API
Fix heroku timeout bug