v3.1.1 - optimizations