[45756] Great performance improvements