optimizations brought back