diff --git a/hparams/bair/ours_deterministic_l1/model_hparams.json b/hparams/bair/ours_deterministic_l1/model_hparams.json
deleted file mode 100644
index 25fb93077aac742cce5f998c3c316ee741032863..0000000000000000000000000000000000000000
--- a/hparams/bair/ours_deterministic_l1/model_hparams.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "batch_size": 32,
-    "lr": 0.001,
-    "beta1": 0.9,
-    "beta2": 0.999,
-    "l1_weight": 1.0,
-    "l2_weight": 0.0,
-    "kl_weight": 0.0,
-    "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 0.0,
-    "state_weight": 0.0001,
-    "nz": 0,
-    "e_net": "none"
-}
\ No newline at end of file
diff --git a/hparams/bair/ours_deterministic_l2/model_hparams.json b/hparams/bair/ours_deterministic_l2/model_hparams.json
deleted file mode 100644
index 6d6145e56aa4cdd9ca6486fec87ea0d2f04fa65a..0000000000000000000000000000000000000000
--- a/hparams/bair/ours_deterministic_l2/model_hparams.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "batch_size": 32,
-    "lr": 0.001,
-    "beta1": 0.9,
-    "beta2": 0.999,
-    "l1_weight": 0.0,
-    "l2_weight": 1.0,
-    "kl_weight": 0.0,
-    "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 0.0,
-    "state_weight": 0.0001,
-    "nz": 0,
-    "e_net": "none"
-}
\ No newline at end of file
diff --git a/hparams/bair/ours_gan/model_hparams.json b/hparams/bair/ours_gan/model_hparams.json
deleted file mode 100644
index 8631fa259be44e0b97a98426fa49ce4cd8d7fdd4..0000000000000000000000000000000000000000
--- a/hparams/bair/ours_gan/model_hparams.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "batch_size": 16,
-    "lr": 0.0002,
-    "beta1": 0.5,
-    "beta2": 0.999,
-    "l1_weight": 100.0,
-    "l2_weight": 0.0,
-    "kl_weight": 0.0,
-    "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 1.0,
-    "state_weight": 0.001,
-    "e_net": "none"
-}
\ No newline at end of file
diff --git a/hparams/bair/ours_savp/model_hparams.json b/hparams/bair/ours_savp/model_hparams.json
deleted file mode 100644
index 5295839d417e206896e4d7cc75faaa7fe391fe2e..0000000000000000000000000000000000000000
--- a/hparams/bair/ours_savp/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "batch_size": 16,
-    "lr": 0.0002,
-    "beta1": 0.5,
-    "beta2": 0.999,
-    "l1_weight": 100.0,
-    "l2_weight": 0.0,
-    "kl_weight": 0.1,
-    "video_sn_vae_gan_weight": 1.0,
-    "video_sn_gan_weight": 1.0,
-    "state_weight": 0.001
-}
\ No newline at end of file
diff --git a/hparams/bair/ours_vae_l1/model_hparams.json b/hparams/bair/ours_vae_l1/model_hparams.json
deleted file mode 100644
index 0536e4f4f2641ae39bfedb2f70cc5112848b4407..0000000000000000000000000000000000000000
--- a/hparams/bair/ours_vae_l1/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "batch_size": 32,
-    "lr": 0.001,
-    "beta1": 0.9,
-    "beta2": 0.999,
-    "l1_weight": 1.0,
-    "l2_weight": 0.0,
-    "kl_weight": 0.001,
-    "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 0.0,
-    "state_weight": 0.0001
-}
\ No newline at end of file
diff --git a/hparams/bair/ours_vae_l2/model_hparams.json b/hparams/bair/ours_vae_l2/model_hparams.json
deleted file mode 100644
index 1b4fd290b2314bd2b229e34409b12455c44c540e..0000000000000000000000000000000000000000
--- a/hparams/bair/ours_vae_l2/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "batch_size": 32,
-    "lr": 0.001,
-    "beta1": 0.9,
-    "beta2": 0.999,
-    "l1_weight": 0.0,
-    "l2_weight": 1.0,
-    "kl_weight": 0.001,
-    "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 0.0,
-    "state_weight": 0.0001
-}
\ No newline at end of file
diff --git a/hparams/bair/sna_l1/model_hparams.json b/hparams/bair/sna_l1/model_hparams.json
deleted file mode 100644
index f32b4e7b64567d23db3c6594bf913e8c657f2b25..0000000000000000000000000000000000000000
--- a/hparams/bair/sna_l1/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "batch_size": 32,
-    "lr": 0.001,
-    "beta1": 0.9,
-    "beta2": 0.999,
-    "l1_weight": 1.0,
-    "l2_weight": 0.0,
-    "kl_weight": 0.0,
-    "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 0.0,
-    "state_weight": 0.0001
-}
\ No newline at end of file
diff --git a/hparams/bair/sna_l2/model_hparams.json b/hparams/bair/sna_l2/model_hparams.json
deleted file mode 100644
index 992882e597889f7875f22982b898619d21ceee66..0000000000000000000000000000000000000000
--- a/hparams/bair/sna_l2/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "batch_size": 32,
-    "lr": 0.001,
-    "beta1": 0.9,
-    "beta2": 0.999,
-    "l1_weight": 0.0,
-    "l2_weight": 1.0,
-    "kl_weight": 0.0,
-    "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 0.0,
-    "state_weight": 0.0001
-}
\ No newline at end of file
diff --git a/hparams/bair/sv2p_time_variant/model_hparams.json b/hparams/bair/sv2p_time_variant/model_hparams.json
deleted file mode 100644
index 9a10efc29454ab436c40dc703f74823ad238f431..0000000000000000000000000000000000000000
--- a/hparams/bair/sv2p_time_variant/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "batch_size": 32,
-    "lr": 0.001,
-    "beta1": 0.9,
-    "beta2": 0.999,
-    "l1_weight": 0.0,
-    "l2_weight": 1.0,
-    "kl_weight": 0.008,
-    "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 0.0,
-    "state_weight": 0.0001
-}
\ No newline at end of file
diff --git a/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json b/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json
index a499cd54c8f41e1be838c9cf8f6ee9a8f32d2a57..4a1b23edcb68b57dadee82b1c13366afac50a52a 100644
--- a/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json
+++ b/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json
@@ -9,6 +9,5 @@
     "video_sn_vae_gan_weight": 0.0,
     "video_sn_gan_weight": 0.0,
     "state_weight": 0.0,
-    "nz": 0,
-    "e_net": "none"
+    "nz": 0
 }
\ No newline at end of file
diff --git a/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json b/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json
index b961c6475921b6ef147c7cf8bf98c37202579d61..31e7152ae15df5ee33b264f11c88c76c50592185 100644
--- a/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json
+++ b/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json
@@ -9,6 +9,5 @@
     "video_sn_vae_gan_weight": 0.0,
     "video_sn_gan_weight": 0.0,
     "state_weight": 0.0,
-    "nz": 0,
-    "e_net": "none"
+    "nz": 0
 }
\ No newline at end of file
diff --git a/hparams/bair_action_free/ours_gan/model_hparams.json b/hparams/bair_action_free/ours_gan/model_hparams.json
index 9874d3ee4ba9e75fd04aef51289dead1b7c223f3..38837822c90f38c6209dfa27019a90ccdf8ea43a 100644
--- a/hparams/bair_action_free/ours_gan/model_hparams.json
+++ b/hparams/bair_action_free/ours_gan/model_hparams.json
@@ -7,7 +7,8 @@
     "l2_weight": 0.0,
     "kl_weight": 0.0,
     "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 1.0,
-    "state_weight": 0.0,
-    "e_net": "none"
+    "video_sn_gan_weight": 0.1,
+    "vae_gan_feature_cdist_weight": 0.0,
+    "gan_feature_cdist_weight": 10.0,
+    "state_weight": 0.0
 }
\ No newline at end of file
diff --git a/hparams/bair_action_free/ours_savp/model_hparams.json b/hparams/bair_action_free/ours_savp/model_hparams.json
index 95c70cebb7a4c2e7503950d505f014d7cefe954f..a6eea83a19505d374e9d614f48ef8bc72443c0f2 100644
--- a/hparams/bair_action_free/ours_savp/model_hparams.json
+++ b/hparams/bair_action_free/ours_savp/model_hparams.json
@@ -5,8 +5,10 @@
     "beta2": 0.999,
     "l1_weight": 100.0,
     "l2_weight": 0.0,
-    "kl_weight": 0.1,
-    "video_sn_vae_gan_weight": 1.0,
-    "video_sn_gan_weight": 1.0,
+    "kl_weight": 1.0,
+    "video_sn_vae_gan_weight": 0.1,
+    "video_sn_gan_weight": 0.1,
+    "vae_gan_feature_cdist_weight": 10.0,
+    "gan_feature_cdist_weight": 0.0,
     "state_weight": 0.0
 }
\ No newline at end of file
diff --git a/hparams/bair_action_free/ours_vae_l2/model_hparams.json b/hparams/bair_action_free/ours_vae_l2/model_hparams.json
deleted file mode 100644
index 4fddf0eef1d45dbfa16f098e5e42b12f594132e3..0000000000000000000000000000000000000000
--- a/hparams/bair_action_free/ours_vae_l2/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "batch_size": 32,
-    "lr": 0.001,
-    "beta1": 0.9,
-    "beta2": 0.999,
-    "l1_weight": 0.0,
-    "l2_weight": 1.0,
-    "kl_weight": 0.001,
-    "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 0.0,
-    "state_weight": 0.0
-}
\ No newline at end of file
diff --git a/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json b/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json
index 329acdf7184f1c945acd703c79bd9d57ae475046..4fddf0eef1d45dbfa16f098e5e42b12f594132e3 100644
--- a/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json
+++ b/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json
@@ -5,7 +5,7 @@
     "beta2": 0.999,
     "l1_weight": 0.0,
     "l2_weight": 1.0,
-    "kl_weight": 0.008,
+    "kl_weight": 0.001,
     "video_sn_vae_gan_weight": 0.0,
     "video_sn_gan_weight": 0.0,
     "state_weight": 0.0
diff --git a/hparams/kth/ours_deterministic_l1/model_hparams.json b/hparams/kth/ours_deterministic_l1/model_hparams.json
index a499cd54c8f41e1be838c9cf8f6ee9a8f32d2a57..4a1b23edcb68b57dadee82b1c13366afac50a52a 100644
--- a/hparams/kth/ours_deterministic_l1/model_hparams.json
+++ b/hparams/kth/ours_deterministic_l1/model_hparams.json
@@ -9,6 +9,5 @@
     "video_sn_vae_gan_weight": 0.0,
     "video_sn_gan_weight": 0.0,
     "state_weight": 0.0,
-    "nz": 0,
-    "e_net": "none"
+    "nz": 0
 }
\ No newline at end of file
diff --git a/hparams/kth/ours_deterministic_l2/model_hparams.json b/hparams/kth/ours_deterministic_l2/model_hparams.json
index b961c6475921b6ef147c7cf8bf98c37202579d61..31e7152ae15df5ee33b264f11c88c76c50592185 100644
--- a/hparams/kth/ours_deterministic_l2/model_hparams.json
+++ b/hparams/kth/ours_deterministic_l2/model_hparams.json
@@ -9,6 +9,5 @@
     "video_sn_vae_gan_weight": 0.0,
     "video_sn_gan_weight": 0.0,
     "state_weight": 0.0,
-    "nz": 0,
-    "e_net": "none"
+    "nz": 0
 }
\ No newline at end of file
diff --git a/hparams/kth/ours_gan/model_hparams.json b/hparams/kth/ours_gan/model_hparams.json
index 9874d3ee4ba9e75fd04aef51289dead1b7c223f3..3d14b63edbf14efca2cefe4703453d899b3fb0fd 100644
--- a/hparams/kth/ours_gan/model_hparams.json
+++ b/hparams/kth/ours_gan/model_hparams.json
@@ -7,7 +7,9 @@
     "l2_weight": 0.0,
     "kl_weight": 0.0,
     "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 1.0,
+    "video_sn_gan_weight": 0.1,
+    "vae_gan_feature_cdist_weight": 0.0,
+    "gan_feature_cdist_weight": 10.0,
     "state_weight": 0.0,
-    "e_net": "none"
+    "nz": 32
 }
\ No newline at end of file
diff --git a/hparams/kth/ours_savp/model_hparams.json b/hparams/kth/ours_savp/model_hparams.json
index 7638a1cac87d470ce9d7f323ccc5502fc2396be3..5eaa29c8b573d0927fe440226e41c7f31441b4ea 100644
--- a/hparams/kth/ours_savp/model_hparams.json
+++ b/hparams/kth/ours_savp/model_hparams.json
@@ -5,8 +5,11 @@
     "beta2": 0.999,
     "l1_weight": 100.0,
     "l2_weight": 0.0,
-    "kl_weight": 0.001,
-    "video_sn_vae_gan_weight": 1.0,
-    "video_sn_gan_weight": 1.0,
-    "state_weight": 0.0
+    "kl_weight": 0.01,
+    "video_sn_vae_gan_weight": 0.1,
+    "video_sn_gan_weight": 0.1,
+    "vae_gan_feature_cdist_weight": 10.0,
+    "gan_feature_cdist_weight": 0.0,
+    "state_weight": 0.0,
+    "nz": 32
 }
\ No newline at end of file
diff --git a/hparams/kth/ours_vae_l1/model_hparams.json b/hparams/kth/ours_vae_l1/model_hparams.json
index efef6a0038c6d9b70958dd82e5243ea1d6a02a53..dee3ce9f8e431d7f7cb46042936cfae3dcfbc6e4 100644
--- a/hparams/kth/ours_vae_l1/model_hparams.json
+++ b/hparams/kth/ours_vae_l1/model_hparams.json
@@ -8,5 +8,6 @@
     "kl_weight": 1e-05,
     "video_sn_vae_gan_weight": 0.0,
     "video_sn_gan_weight": 0.0,
-    "state_weight": 0.0
+    "state_weight": 0.0,
+    "nz": 32
 }
\ No newline at end of file
diff --git a/hparams/kth/sv2p_time_invariant/model_hparams.json b/hparams/kth/sv2p_time_invariant/model_hparams.json
deleted file mode 100644
index f1273998fd03bd3404eb73c93ba7108ce98f89d3..0000000000000000000000000000000000000000
--- a/hparams/kth/sv2p_time_invariant/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "batch_size": 16,
-    "lr": 0.001,
-    "beta1": 0.9,
-    "beta2": 0.999,
-    "l1_weight": 0.0,
-    "l2_weight": 1.0,
-    "kl_weight": 0.008,
-    "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 0.0,
-    "state_weight": 0.0
-}
\ No newline at end of file
diff --git a/hparams/kth/sv2p_time_variant/model_hparams.json b/hparams/kth/sv2p_time_variant/model_hparams.json
deleted file mode 100644
index f1273998fd03bd3404eb73c93ba7108ce98f89d3..0000000000000000000000000000000000000000
--- a/hparams/kth/sv2p_time_variant/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "batch_size": 16,
-    "lr": 0.001,
-    "beta1": 0.9,
-    "beta2": 0.999,
-    "l1_weight": 0.0,
-    "l2_weight": 1.0,
-    "kl_weight": 0.008,
-    "video_sn_vae_gan_weight": 0.0,
-    "video_sn_gan_weight": 0.0,
-    "state_weight": 0.0
-}
\ No newline at end of file