condensed excessive grouping, change legacy support method