Merged wep app code