With runtime database
Prepare to deployment on Heroku
heroku: added loop