Makai modifications to Deck.java