Seperate PR for this stuff, it needs to be benchmarked/tested in production independently