Implemented the DemoActivity and other changes