optimizations #2