added grouping across files per #346