remove comment code, add CardsType