- Yet more optimizations