Some optimization