Added DemoTime functionality