Fix simulation system and add card data