updated group methods
refactored
refactored