Updates to CardController