More performance improvements...