diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs
index e6c76ab..1d2f47b 100644
--- a/overrides/scripts/Earlygame.zs
+++ b/overrides/scripts/Earlygame.zs
@@ -25,12 +25,6 @@ alloy.recipeBuilder().inputs([<minecraft:diamond>,<ore:dustPulsating>]).outputs(
 furnace.remove(<metaitem:nuggetWroughtIron>);
 furnace.addRecipe(<metaitem:ingotWroughtIron>, <minecraft:iron_ingot>, 0.0);
 
-recipes.remove(<storagedrawers:upgrade_template>);
-recipes.addShaped(<storagedrawers:upgrade_template> * 2, [
-	[<ore:stickWood>, <ore:stickWood>, <ore:stickWood>],
-	[<ore:stickWood>, <storagedrawers:customdrawers>, <ore:stickWood>],
-	[<ore:stickWood>, <ore:stickWood>, <ore:stickWood>]]);
-
 //Wood Pulp
 recipes.addShapeless(<metaitem:dustWood> * 4,[<ore:logWood>,<ore:gtceMortars>]);
 
diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs
index 90b8c53..ae5e17a 100644
--- a/overrides/scripts/expertmode.zs
+++ b/overrides/scripts/expertmode.zs
@@ -716,6 +716,8 @@ recipes.addShaped(<minecraft:dispenser>, [
     [<metaitem:gearSmallIron>, <metaitem:stickRedAlloy>, <metaitem:gearSmallIron>]
 ]);
 
+recipes.remove(<minecraft:comparator>);
+recipes.remove(<minecraft:repeater>);
 
 recipes.remove(<minecraft:piston>);
 // Piston * 4
@@ -839,6 +841,27 @@ assembler.recipeBuilder()
     .duration(100).EUt(960)
     .buildAndRegister();
 
+// Small Storage Crates
+recipes.removeByRecipeName("actuallyadditions:recipes162");
+assembler.recipeBuilder()
+    .inputs(<ore:chestWood> * 4, <metaitem:frameTreatedWood> * 4, <metaitem:crate.steel>)
+    .outputs(<actuallyadditions:block_giant_chest>)
+    .duration(100).EUt(7).buildAndRegister();
+
+// Drawer Upgrades
+recipes.remove(<storagedrawers:upgrade_template>);
+recipes.removeByRecipeName("storagedrawers:upgrade_storage_emerald");
+recipes.removeByRecipeName("storagedrawers:upgrade_storage_diamond");
+
+recipes.addShaped(<storagedrawers:upgrade_template> * 4, [
+	[<ore:stickBrass>, <ore:stickBrass>, <ore:stickBrass>],
+	[<ore:stickBrass>, <storagedrawers:customdrawers>, <ore:stickBrass>],
+	[<ore:stickBrass>, <ore:stickBrass>, <ore:stickBrass>]]);
+
+recipes.addShaped(<storagedrawers:upgrade_storage:3>, [[<ore:stickWood>, <ore:stickWood>, <ore:stickWood>], [<ore:ingotAluminium>, <storagedrawers:upgrade_template>, <ore:ingotAluminium>], [<ore:stickWood>, <ore:stickWood>, <ore:stickWood>]]);
+recipes.addShaped(<storagedrawers:upgrade_storage:4>, [[<ore:stickWood>, <ore:stickWood>, <ore:stickWood>], [<ore:ingotVibrantAlloy>, <storagedrawers:upgrade_template>, <ore:ingotVibrantAlloy>], [<ore:stickWood>, <ore:stickWood>, <ore:stickWood>]]);
+
+
 // Removals
 mods.jei.JEI.removeAndHide(<thermalexpansion:augment:640>);
 recipes.removeByMod("deepmoblearning");
diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs
index ae3feb7..557b897 100644
--- a/overrides/scripts/normalmode.zs
+++ b/overrides/scripts/normalmode.zs
@@ -505,6 +505,13 @@ autoclave.recipeBuilder()
 	.EUt(320)
 	.buildAndRegister();
 
+// Upgrade Template
+recipes.remove(<storagedrawers:upgrade_template>);
+recipes.addShaped(<storagedrawers:upgrade_template> * 2, [
+	[<ore:stickWood>, <ore:stickWood>, <ore:stickWood>],
+	[<ore:stickWood>, <storagedrawers:customdrawers>, <ore:stickWood>],
+	[<ore:stickWood>, <ore:stickWood>, <ore:stickWood>]]);
+
 // Removals
 // GT
 mods.jei.JEI.removeAndHide(<meta_tile_entity:steam_extractor_bronze>);