Updated with feedback from the group