Fixed up card generation process