Fix CS
Improved CS and CC