Code Revieewed and make some minor changes for the demo
Commiting