Further changes to demo