Even more optimizations