Some optimization!