And optimized even more