Updated Table and Card