0.0.5 optimizations
0.0.5 optimizations