some minor changes to demo