Merge into app.js