diff --git a/animations/armor_stand.animation.json b/animations/armor_stand.animation.json
index 8af04dc..b276b15 100644
--- a/animations/armor_stand.animation.json
+++ b/animations/armor_stand.animation.json
@@ -5,22 +5,34 @@
 			"loop": true,
 			"bones": {
 				"head": {
-					"rotation": ["math.mod(math.floor(query.mark_variant / 1000000), 1000)", "math.mod(math.floor(query.mark_variant / 1000), 1000)", "math.mod(query.mark_variant, 1000)"]
+					"rotation": ["(math.mod(math.floor(query.mark_variant / 10000), 100) + (math.mod(math.floor(query.mark_variant / 4000000), 2) * 100)) * (query.is_interested > 0 ? -1 : 1)",
+   "(math.mod(math.floor(query.mark_variant / 100), 100) + (math.mod(math.floor(query.mark_variant / 2000000), 2) * 100)) * (query.is_charged > 0 ? -1 : 1)",
+   "((math.mod(query.mark_variant, 100) + math.mod(math.floor(query.mark_variant / 1000000), 2) * 100)) * (query.is_powered > 0 ? -1 : 1)"]
 				},
 				"geyser_chest": {
-					"rotation": ["math.mod(math.floor(query.variant / 1000000), 1000)", "math.mod(math.floor(query.variant / 1000), 1000)", "math.mod(query.variant, 1000)"]
+					"rotation": ["(math.mod(math.floor(query.variant / 10000), 100) + (math.mod(math.floor(query.variant / 4000000), 2) * 100)) * (query.is_in_love > 0 ? -1 : 1)",
+   "(math.mod(math.floor(query.variant / 100), 100) + (math.mod(math.floor(query.variant / 2000000), 2) * 100)) * (query.is_celebrating > 0 ? -1 : 1)",
+   "((math.mod(query.variant, 100) + math.mod(math.floor(query.variant / 1000000), 2) * 100)) * (query.is_celebrating_special > 0 ? -1 : 1)"]
 				},
 				"leftarm": {
-					"rotation": ["math.mod(math.floor(query.trade_tier / 1000000), 1000)", "math.mod(math.floor(query.trade_tier / 1000), 1000)", "math.mod(query.trade_tier, 1000)"]
+					"rotation": ["(math.mod(math.floor(query.trade_tier / 10000), 100) + (math.mod(math.floor(query.trade_tier / 4000000), 2) * 100)) * (query.is_charging > 0 ? -1 : 1)",
+   "(math.mod(math.floor(query.trade_tier / 100), 100) + (math.mod(math.floor(query.trade_tier / 2000000), 2) * 100)) * (query.is_critical > 0 ? -1 : 1)",
+   "((math.mod(query.trade_tier, 100) + math.mod(math.floor(query.trade_tier / 1000000), 2) * 100)) * (query.is_dancing > 0 ? -1 : 1)"]
 				},
 				"rightarm": {
-					"rotation": ["math.mod(math.floor(query.max_trade_tier / 1000000), 1000)", "math.mod(math.floor(query.max_trade_tier / 1000), 1000)", "math.mod(query.max_trade_tier, 1000)"]
+					"rotation": ["(math.mod(math.floor(query.max_trade_tier / 10000), 100) + (math.mod(math.floor(query.max_trade_tier / 4000000), 2) * 100)) * (query.is_elder > 0 ? -1 : 1)",
+   "(math.mod(math.floor(query.max_trade_tier / 100), 100) + (math.mod(math.floor(query.max_trade_tier / 2000000), 2) * 100)) * (query.is_emoting > 0 ? -1 : 1)",
+   "((math.mod(query.max_trade_tier, 100) + math.mod(math.floor(query.max_trade_tier / 1000000), 2) * 100)) * (query.is_idling > 0 ? -1 : 1)"]
 				},
 				"leftleg": {
-					"rotation": ["math.mod(math.floor(query.skin_id / 1000000), 1000)", "math.mod(math.floor(query.skin_id / 1000), 1000)", "math.mod(query.skin_id, 1000)"]
+					"rotation": ["(math.mod(math.floor(query.skin_id / 10000), 100) + (math.mod(math.floor(query.skin_id / 4000000), 2) * 100)) * (query.is_illager_captain > 0 ? -1 : 1)",
+   "(math.mod(math.floor(query.skin_id / 100), 100) + (math.mod(math.floor(query.skin_id / 2000000), 2) * 100)) * (query.is_in_ui > 0 ? -1 : 1)",
+   "((math.mod(query.skin_id, 100) + math.mod(math.floor(query.skin_id / 1000000), 2) * 100)) * (query.is_lingering > 0 ? -1 : 1)"]
 				},
 				"rightleg": {
-					"rotation": ["math.mod(math.floor(query.life_span / 1000000), 1000)", "math.mod(math.floor(query.life_span / 1000), 1000)", "math.mod(query.life_span, 1000)"]
+					"rotation": ["(math.mod(math.floor(query.hurt_direction / 10000), 100) + (math.mod(math.floor(query.hurt_direction / 4000000), 2) * 100)) * (query.is_pregnant > 0 ? -1 : 1)",
+   "(math.mod(math.floor(query.hurt_direction / 100), 100) + (math.mod(math.floor(query.hurt_direction / 2000000), 2) * 100)) * (query.is_sheared > 0 ? -1 : 1)",
+   "((math.mod(query.hurt_direction, 100) + math.mod(math.floor(query.hurt_direction / 1000000), 2) * 100)) * (query.is_stalking > 0 ? -1 : 1)"]
 				}
 			}
 		}
diff --git a/manifest.json b/manifest.json
index f80d867..00844ee 100755
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
         "description": "Geyser Vanilla Assets",
         "name": "Geyser Vanilla Assets",
         "uuid": "5d8f8e98-7a2a-11eb-9439-0242ac130002",
-        "version": [1, 0, 30],
+        "version": [1, 0, 49],
         "min_engine_version": [ 1, 16, 0 ]
     },
     "modules": [
@@ -12,7 +12,7 @@
             "description": "Geyser Vanilla Assets",
             "type": "resources",
             "uuid": "72e9b0ca-7a2a-11eb-9439-0242ac130002",
-            "version": [1, 0, 30]
+            "version": [1, 0, 49]
         }
     ]
 }