Small Changes to the demo