fixing demo and switchting to defaulscheduler