Minor changes to demo