diff --git a/app/Models/userCards.php b/app/Models/userCards.php
index 0df2f7e..665a8cd 100644
--- a/app/Models/userCards.php
+++ b/app/Models/userCards.php
@@ -129,7 +129,7 @@ class userCards extends Model{
                 $suffix = str_pad($ic, 5, '0', STR_PAD_LEFT);
                 $out['name_' . $suffix] = $f['name'];
                 $out['assign_id_' . $suffix] = $f['assign_id'];
-                $out['card_id_' . $suffix] = $f['card_id'];
+             /*   $out['card_id_' . $suffix] = $f['card_id'];
                 $out['can_save_' . $suffix] = $f['can_save'];
                 $out['short_title_' . $suffix] = $f['short_title'];
                 $out['title_' . $suffix] = $f['short_title'];
@@ -160,6 +160,40 @@ class userCards extends Model{
                 $out['background_color_' . $suffix] = $f['background_color'];
                 $out['blog_id_' . $suffix] = $f['blog_id'];
                 $out['expiration_' . $suffix] = $f['expiration'];
+*/
+
+                $out['card_id_' . $suffix] = $f['card_id'];
+                $out['can_save_' . $suffix] = $f['can_save'];
+                $out['short_title_' . $suffix] = $f['short_title'];
+                $out['title_' . $suffix] = $f['short_title'];
+                $out['background_picture_' . $suffix] = $f['background_picture'];
+                $out['button1_' . $suffix] = $f['button1'];
+                $out['button1_text_' . $suffix] = $f['button1_text'];
+                $out['button1_action_' . $suffix] = $f['button1_action'];
+                $out['expires_' . $suffix] = $f['card_expiration'];
+                $out['template_' . $suffix] = $f['template'];
+                $out['card_canexpire_' . $suffix] = $f['card_canexpire'];
+                $out['card_action_type_' . $suffix] = $f['card_action_type'];
+                $out['card_action_data_' . $suffix] = $f['card_action_data'];
+                $out['titleshow_' . $suffix] = $f['titleshow'];
+                $out['multiple_answer_' . $suffix] = $f['multiple_answer'];
+                $out['use_short_title_' . $suffix] = $f['use_short_title'];
+                $out['target_key_' . $suffix] = $f['target_key'];
+                $out['target_text_' . $suffix] = $f['target_text'];
+                $out['description_' . $suffix] = $f['description'];
+                $out['long_description_' . $suffix] = $f['long_description'];
+                $out['card_behavior_' . $suffix] = $f['card_behavior'];
+                $out['card_type_' . $suffix] = $f['card_type'];
+                $out['card_time_' . $suffix] = $f['card_time'];
+                $out['card_country_' . $suffix] = 'US'; // $f['card_country']; for now
+                $out['card_location_' . $suffix] = $f['card_location'];
+                $out['latitude_' . $suffix] = $f['latitude'];
+                $out['longitude_' . $suffix] = $f['longitude'];
+                $out['card_order_' . $suffix] = $f['card_order'];
+                $out['background_color_' . $suffix] = $f['background_color'];
+                $out['blog_id_' . $suffix] = $f['blog_id'];
+                $out['expiration_' . $suffix] = $f['expiration'];
+
 
                 //$out['card_action_type_' . $suffix] = $f['card_action_type'];
                 //$out['card_action_data_' . $suffix] = $f['card_action_data'];