Update v2.0j- "micro optimizations"