Improved group-list