Some optimization 1