Improve cx

Improve cx