modifications to demo