Minor modifications to demo 3.