Weight-based optimization is back in place