v0.9dev optimizations