Modifications to demo