Grabbed changes to demo-app