More choosecard changes