Changes to start from app.js