Some optimization..