Heroku Timeout Fix