Some Changes in Demo