More changes to FiveCardDraw