Worked a bit on new World.js