Redid group saving

Signed-off-by: Oz Ramos <>