More Optimizer Logic