I'd be okay with it as is if they just made it so shuffle made it so you didn't draw the same card twice in a row.