Some code adjustments
Create Demos