C1 may all groups sp two

@yasmin-eltahan plz merge #240 #165 #166