more updates to demo3