Added a new level of optimization.