Local changes for CLS