fix simulator and add card data