Even more performance optimizations...