Updated DemoReader