add subgroup and deadline fix
merge