diff --git a/src/main/java/net/Indyuce/mmoitems/api/crafting/condition/Condition.java b/src/main/java/net/Indyuce/mmoitems/api/crafting/condition/Condition.java
index 160e5b8b..3d287115 100644
--- a/src/main/java/net/Indyuce/mmoitems/api/crafting/condition/Condition.java
+++ b/src/main/java/net/Indyuce/mmoitems/api/crafting/condition/Condition.java
@@ -49,5 +49,9 @@ public abstract class Condition {
 		public Condition getCondition() {
 			return condition;
 		}
+		
+		public String format() {
+			return condition.formatDisplay(isMet() ? condition.getDisplay().getPositive() : condition.getDisplay().getNegative());
+		}
 	}
 }
diff --git a/src/main/java/net/Indyuce/mmoitems/api/crafting/ingredient/Ingredient.java b/src/main/java/net/Indyuce/mmoitems/api/crafting/ingredient/Ingredient.java
index 31aafcea..cbfbe0ce 100644
--- a/src/main/java/net/Indyuce/mmoitems/api/crafting/ingredient/Ingredient.java
+++ b/src/main/java/net/Indyuce/mmoitems/api/crafting/ingredient/Ingredient.java
@@ -83,5 +83,9 @@ public abstract class Ingredient {
 		public PlayerIngredient getPlayerIngredient() {
 			return found;
 		}
+
+		public String format() {
+			return inventory.formatLoreDisplay(isHad() ? inventory.getDisplay().getPositive() : inventory.getDisplay().getNegative());
+		}
 	}
 }
diff --git a/src/main/java/net/Indyuce/mmoitems/api/crafting/recipe/RecipeInfo.java b/src/main/java/net/Indyuce/mmoitems/api/crafting/recipe/RecipeInfo.java
index 502cf830..5b8b1fa2 100644
--- a/src/main/java/net/Indyuce/mmoitems/api/crafting/recipe/RecipeInfo.java
+++ b/src/main/java/net/Indyuce/mmoitems/api/crafting/recipe/RecipeInfo.java
@@ -68,12 +68,12 @@ public class RecipeInfo {
 		return recipe.display(this);
 	}
 
-	public CheckedCondition getCondition(String format) {
-		for (CheckedCondition condition : conditions)
-			if (condition.getCondition().getId().equals(format))
-				return condition;
-		return null;
-	}
+//	public CheckedCondition getCondition(String format) {
+//		for (CheckedCondition condition : conditions)
+//			if (condition.getCondition().getId().equals(format))
+//				return condition;
+//		return null;
+//	}
 
 	public Set<CheckedCondition> getConditions() {
 		return conditions;
diff --git a/src/main/java/net/Indyuce/mmoitems/api/item/plugin/crafting/CraftingRecipeDisplay.java b/src/main/java/net/Indyuce/mmoitems/api/item/plugin/crafting/CraftingRecipeDisplay.java
index 8d13b300..18693596 100644
--- a/src/main/java/net/Indyuce/mmoitems/api/item/plugin/crafting/CraftingRecipeDisplay.java
+++ b/src/main/java/net/Indyuce/mmoitems/api/item/plugin/crafting/CraftingRecipeDisplay.java
@@ -3,8 +3,8 @@ package net.Indyuce.mmoitems.api.item.plugin.crafting;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 
 import org.bukkit.ChatColor;
@@ -51,8 +51,10 @@ public class CraftingRecipeDisplay extends ConfigItem {
 
 		public ItemStack build() {
 			Map<String, String> replace = new HashMap<>();
+			int conditionsIndex = -1;
 
-			for (Iterator<String> iterator = lore.iterator(); iterator.hasNext();) {
+			for (ListIterator<String> iterator = lore.listIterator(); iterator.hasNext();) {
+				int index = iterator.nextIndex();
 				String str = iterator.next();
 
 				/*
@@ -67,29 +69,12 @@ public class CraftingRecipeDisplay extends ConfigItem {
 					replace.put(str, str.replace("{crafting_time}", "").replace("#crafting-time#", craftingTimeFormat.format(craftingRecipe.getCraftingTime())));
 				}
 
-				if (str.equals("{conditions}")) {
-					if (recipe.getConditions().size() == 0) {
+				if (str.startsWith("{conditions}")) {
+					conditionsIndex = index;
+					if (recipe.getConditions().size() == 0)
 						iterator.remove();
-						continue;
-					}
-
-					replace.put(str, str.replace("{conditions}", ""));
-				}
-
-				/*
-				 * load conditions
-				 */
-				if (str.startsWith("#condition_")) {
-					String format = str.substring("#condition_".length(), str.length() - 1);
-					CheckedCondition info = recipe.getCondition(format);
-					if (info == null) {
-						iterator.remove();
-						continue;
-					}
-
-					ConditionalDisplay display = info.getCondition().getDisplay();
-					if (display != null)
-						replace.put(str, info.getCondition().formatDisplay(info.isMet() ? display.getPositive() : display.getNegative()));
+					else
+						replace.put(str, str.replace("{conditions}", ""));
 				}
 			}
 
@@ -102,7 +87,16 @@ public class CraftingRecipeDisplay extends ConfigItem {
 			 */
 			int index = lore.indexOf("#ingredients#");
 			lore.remove(index);
-			recipe.getIngredients().forEach(info -> lore.add(index, info.getIngredient().formatLoreDisplay(info.isHad() ? info.getIngredient().getDisplay().getPositive() : info.getIngredient().getDisplay().getNegative())));
+			recipe.getIngredients().forEach(info -> lore.add(index, info.format()));
+
+			if (conditionsIndex >= 0)
+				for (CheckedCondition condition : recipe.getConditions()) {
+					ConditionalDisplay display = condition.getCondition().getDisplay();
+					if (display != null)
+						// ++ allows to sort displays in the same order as in
+						// the config
+						lore.add(conditionsIndex++, condition.format());
+				}
 
 			/*
 			 * apply color to lore
diff --git a/src/main/java/net/Indyuce/mmoitems/api/item/plugin/crafting/UpgradingRecipeDisplay.java b/src/main/java/net/Indyuce/mmoitems/api/item/plugin/crafting/UpgradingRecipeDisplay.java
index f22e5f5c..a5413fcd 100644
--- a/src/main/java/net/Indyuce/mmoitems/api/item/plugin/crafting/UpgradingRecipeDisplay.java
+++ b/src/main/java/net/Indyuce/mmoitems/api/item/plugin/crafting/UpgradingRecipeDisplay.java
@@ -2,8 +2,8 @@ package net.Indyuce.mmoitems.api.item.plugin.crafting;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 
 import org.bukkit.ChatColor;
@@ -47,33 +47,18 @@ public class UpgradingRecipeDisplay extends ConfigItem {
 
 		public ItemStack build() {
 			Map<String, String> replace = new HashMap<>();
+			int conditionsIndex = -1;
 
-			for (Iterator<String> iterator = lore.iterator(); iterator.hasNext();) {
+			for (ListIterator<String> iterator = lore.listIterator(); iterator.hasNext();) {
+				int index = iterator.nextIndex();
 				String str = iterator.next();
 
-				if (str.equals("{conditions}")) {
-					if (recipe.getConditions().size() == 0) {
+				if (str.startsWith("{conditions}")) {
+					conditionsIndex = index;
+					if (recipe.getConditions().size() == 0)
 						iterator.remove();
-						continue;
-					}
-
-					replace.put(str, str.replace("{conditions}", ""));
-				}
-
-				/*
-				 * load conditions
-				 */
-				if (str.startsWith("#condition_")) {
-					String format = str.substring("#condition_".length(), str.length() - 1);
-					CheckedCondition info = recipe.getCondition(format);
-					if (info == null) {
-						iterator.remove();
-						continue;
-					}
-
-					ConditionalDisplay display = info.getCondition().getDisplay();
-					if (display != null)
-						replace.put(str, info.getCondition().formatDisplay(info.isMet() ? display.getPositive() : display.getNegative()));
+					else
+						replace.put(str, str.replace("{conditions}", ""));
 				}
 			}
 
@@ -86,8 +71,16 @@ public class UpgradingRecipeDisplay extends ConfigItem {
 			 */
 			int index = lore.indexOf("#ingredients#");
 			lore.remove(index);
-			recipe.getIngredients().forEach(info -> lore.add(index, info.getIngredient().formatLoreDisplay(info.isHad() ? info.getIngredient().getDisplay().getPositive() : info.getIngredient().getDisplay().getNegative())));
+			recipe.getIngredients().forEach(info -> lore.add(index, info.format()));
 
+			if (conditionsIndex >= 0)
+				for (CheckedCondition condition : recipe.getConditions()) {
+					ConditionalDisplay display = condition.getCondition().getDisplay();
+					if (display != null)
+						// ++ allows to sort displays in the same order as in
+						// the config
+						lore.add(conditionsIndex++, condition.format());
+				}
 			/*
 			 * apply color to lore
 			 */