Adding mild optimization.