updated with group work