reworked the CS