diff --git a/common/culture/innovations/00_early_medieval_innovations.txt b/common/culture/innovations/00_early_medieval_innovations.txt
index 1ad0eeb8c..2460f38e4 100644
--- a/common/culture/innovations/00_early_medieval_innovations.txt
+++ b/common/culture/innovations/00_early_medieval_innovations.txt
@@ -31,6 +31,7 @@
 @coinage = "gfx/interface/icons/culture_innovations/innovation_coinage.dds"
 @horseshoes = "gfx/interface/icons/culture_innovations/innovation_horseshoes.dds"
 @cloud_ladder = "gfx/interface/icons/culture_innovations/innovation_auh_cloud_ladder.dds"
+@knighthood = "gfx/interface/icons/culture_innovations/innovation_knighthood.dds"
 
 @camel = "gfx/interface/icons/culture_innovations/innovation_camel.dds"
 @elephant = "gfx/interface/icons/culture_innovations/innovation_elephant.dds"
@@ -176,19 +177,6 @@ innovation_arched_saddle = {
 	flag = early_medieval_era_regular
 }
 
-#culture_group_civic
-innovation_hereditary_rule = {
-	skill = diplomacy
-	group = culture_group_civic
-	culture_era = culture_era_early_medieval
-	icon = @majesty_02
-
-	unlock_law = partition_succession_law
-
-	flag = global_regular
-	flag = early_medieval_era_regular
-}
-
 innovation_manorialism = {
 	skill = stewardship
 	group = culture_group_civic
@@ -234,6 +222,25 @@ innovation_currency_02 = {
 	flag = early_medieval_era_regular
 }
 
+innovation_knighthood = {
+	skill = martial
+	group = culture_group_military
+	culture_era = culture_era_high_medieval
+	icon = @knighthood	
+
+	character_modifier = {
+		active_accolades = 1
+		glory_hound_opinion = 5
+		knight_effectiveness_mult = 0.2
+		accolade_glory_gain_mult = 0.1
+	}
+	custom = students_of_knighthood
+	custom = more_glory_hounds
+
+	flag = global_regular
+	flag = early_medieval_era_regular
+}
+
 innovation_royal_prerogative = {
 	skill = diplomacy
 	group = culture_group_civic
diff --git a/common/culture/innovations/00_high_medieval_innovations.txt b/common/culture/innovations/00_high_medieval_innovations.txt
index fbd75116a..4f46a92df 100644
--- a/common/culture/innovations/00_high_medieval_innovations.txt
+++ b/common/culture/innovations/00_high_medieval_innovations.txt
@@ -29,7 +29,6 @@
 @coins = "gfx/interface/icons/culture_innovations/innovation_welfare_01.dds"
 @misc_inventions = "gfx/interface/icons/culture_innovations/innovation_misc_inventions.dds"
 @advanced_bowmaking = "gfx/interface/icons/culture_innovations/innovation_advanced_bowmaking.dds"
-@knighthood = "gfx/interface/icons/culture_innovations/innovation_knighthood.dds"
 @heraldry = "gfx/interface/icons/culture_innovations/innovation_heraldry.dds"
 @windmills = "gfx/interface/icons/culture_innovations/innovation_windmills.dds"
 @siege_tower = "gfx/interface/icons/culture_innovations/innovation_auh_siege_tower.dds"
@@ -108,25 +107,6 @@ innovation_men_at_arms = {
 	flag = high_medieval_era_regular
 }
 
-innovation_knighthood = {
-	skill = martial
-	group = culture_group_military
-	culture_era = culture_era_high_medieval
-	icon = @knighthood	
-
-	character_modifier = {
-		active_accolades = 1
-		glory_hound_opinion = 5
-		knight_effectiveness_mult = 0.2
-		accolade_glory_gain_mult = 0.1
-	}
-	custom = students_of_knighthood
-	custom = more_glory_hounds
-
-	flag = global_regular
-	flag = high_medieval_era_regular
-}
-
 innovation_advanced_bowmaking = {
 	skill = learning
 	group = culture_group_military
@@ -153,8 +133,9 @@ innovation_heraldry = {
 	culture_era = culture_era_high_medieval
 	icon = @heraldry
 
-	unlock_law = high_partition_succession_law
 	unlock_law = single_heir_dynasty_house
+	unlock_law = single_heir_succession_law
+	unlock_law = single_heir_succession_law_youngest	
 	custom = more_courtly
 
 	flag = global_regular
diff --git a/common/culture/innovations/00_late_medieval_innovations.txt b/common/culture/innovations/00_late_medieval_innovations.txt
index a1313c5e9..a9d692028 100644
--- a/common/culture/innovations/00_late_medieval_innovations.txt
+++ b/common/culture/innovations/00_late_medieval_innovations.txt
@@ -146,21 +146,6 @@ innovation_plate_armor = {
 	flag = late_medieval_era_regular
 }
 
-#culture_group_civic
-innovation_primogeniture = {
-	skill = diplomacy
-	group = culture_group_civic
-	culture_era = culture_era_late_medieval
-	icon = @majesty_01
-
-	unlock_law = single_heir_succession_law
-	unlock_law = single_heir_succession_law_youngest
-
-	custom = more_zealot
-
-	flag = global_regular
-	flag = late_medieval_era_regular
-}
 
 innovation_cranes = {
 	skill = stewardship
diff --git a/common/culture/innovations/00_tribal_innovations.txt b/common/culture/innovations/00_tribal_innovations.txt
index 0be5f0163..f4c3f2949 100644
--- a/common/culture/innovations/00_tribal_innovations.txt
+++ b/common/culture/innovations/00_tribal_innovations.txt
@@ -216,6 +216,8 @@ innovation_gavelkind = {
 	icon = @administration_3
 
 	unlock_law = confederate_partition_succession_law
+	unlock_law = high_partition_succession_law
+	unlock_law = partition_succession_law	
 	
 	character_modifier = {
 		domain_limit = 1