Further redid the CS!