Minor modifications to demo file