re-did changes to web.js