Some optimization again