groupAccount refactored