Updated group solution