Even more performance improvements...