Can we remove this before merging? -- could become a performance bottleneck...