Added groups to default schedule, step 1 of demo
Changed names