added some group functionality