Updated according to changes in deck-system.