Added some group controller stuff