#194 collection rework