And even more optimizations