Main.js continued