Cleaned up group controller