Added groups, updated schedule