Merged the changes of logicforpathing into app.js