varios changes around CRC -WC