Adding more checks for CC