Added optimization.