diff --git a/data/trz/functions/tent/booth_trader.mcfunction b/data/trz/functions/tent/booth_trader.mcfunction
index e0ddd8d..bc25de7 100644
--- a/data/trz/functions/tent/booth_trader.mcfunction
+++ b/data/trz/functions/tent/booth_trader.mcfunction
@@ -57,6 +57,7 @@ execute positioned ~1 ~4 ~-1 run kill @e[distance=..3,type=item_frame,tag=TrzTen
 execute positioned ~1 ~4 ~-1 run kill @e[distance=..3,type=item,nbt={Item:{id:"minecraft:item_frame"}}]
 summon item_frame ~1 ~4 ~-1 {Invulnerable:1b,Facing:3,ItemDropChance:0.0,Item:{id:emerald,Count:1},Tags:["TrzTentTrader"]}
 
-# Wandering Trader
+# Trader Villager
 execute positioned ~1 ~0 ~-1 run tp @e[distance=..3,type=wandering_trader,tag=TrzTentTrader] ~0 -10 ~0
-summon wandering_trader ~1 ~0.5 ~-1 {CustomName:"\"Meirtash Calawa\"",CustomNameVisible:0,PersistenceRequired:1,Offers:{Recipes:[{rewardExp:0,maxUses:999,buy:{id:stick,Count:48},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:oak_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:birch_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:spruce_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:jungle_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:acacia_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:dark_oak_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:charcoal,Count:32},sell:{id:emerald,Count:5},xp:0},{rewardExp:0,maxUses:999,buy:{id:smooth_stone,Count:16},sell:{id:emerald,Count:3},xp:0},{rewardExp:0,maxUses:999,buy:{id:book,Count:5},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:bone_meal,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:rotten_flesh,Count:34},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:bread,Count:7},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:beetroot_soup,Count:2},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:mushroom_stew,Count:2},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:rabbit_stew,Count:1},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:cookie,Count:32},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:pumpkin_pie,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:cake,Count:1},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:leather,Count:16},sell:{id:saddle,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:white_wool,Count:2},sell:{id:string,Count:4},xp:0}]},Tags:["TrzTentTrader"]}
+execute positioned ~1 ~0 ~-1 run tp @e[distance=..3,type=villager,tag=TrzTentTrader] ~0 -10 ~0
+summon villager ~1 ~0.5 ~-1 {CustomName:"\"Meirtash Calawa\"",CustomNameVisible:0,PersistenceRequired:1,VillagerData:{level:5,profession:cartographer,type:desert},Offers:{Recipes:[{rewardExp:0,maxUses:999,buy:{id:stick,Count:48},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:oak_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:birch_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:spruce_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:jungle_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:acacia_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:dark_oak_log,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:charcoal,Count:32},sell:{id:emerald,Count:5},xp:0},{rewardExp:0,maxUses:999,buy:{id:smooth_stone,Count:16},sell:{id:emerald,Count:3},xp:0},{rewardExp:0,maxUses:999,buy:{id:book,Count:5},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:bone_meal,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:rotten_flesh,Count:34},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:bread,Count:7},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:beetroot_soup,Count:2},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:mushroom_stew,Count:2},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:rabbit_stew,Count:1},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:cookie,Count:32},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:pumpkin_pie,Count:4},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:cake,Count:1},sell:{id:emerald,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:leather,Count:16},sell:{id:saddle,Count:1},xp:0},{rewardExp:0,maxUses:999,buy:{id:white_wool,Count:2},sell:{id:string,Count:4},xp:0}]},Tags:["TrzTentTrader"]}