Changed logic to stop heroku requests from blocking