Main.js changes only