Prepare for Heroku part. 2