Updated web.js - part 1 - final