more changes to demo app