0.2.12: Optimizations