major fixes for group