Improve C.S.

Improve C.S.