Web and Android changes