CLS optimization