change to 30 cards and add switch