Even more performance optimization...