Changes to deck_gen