reinstated optimizations