fixing demo and switching to DefaulScheduler