ENH: Worked on the demo