CardGen modifications