Modified web.js in dev branch