Updated to allow for group work