optimizations for 1.0