Updated web server code