Added comments & Updated demo code