Changed some of the web-related functions