Modified main.js for dev branch