Code modifications for weApp