* added group handling