diff --git a/monsters.sty b/monsters.sty
index b337131e50ccce33478fb91ed0a90ffeca5e0398..8eb5950bb6ffc0b3dd1bfb1027b6fd4f75e56de6 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -1669,36 +1669,50 @@ Academics~1, \ifodd\value{r12} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\va
   }%
 }
 
-\newcommand{\ghast}[1][\npc{\D}{Ghast}]{
-  #1
-  \randomtwo\addtocounter{enc}{1}
-  \randomtwoB
-  \randomtwoC
-  \addtocounter{r2b}{-1}
-\person{\arabic{enc}}% STRENGTH
-{\arabic{r2b}}% DEXTERITY 
-{\arabic{r2c}}% SPEED
-{{\arabic{enc}}% INTELLIGENCE
-{0}% WITS
-{-5}}% CHARISMA
-{2}% DR
-{2}% COMBAT
-{Brawl~\arabic{enc}, \ifodd\value{r3} Caving\else Deceit\fi~\arabic{r3}, Tactics~\arabic{r2}, Vigilance~1}% SKILLS
-{\ifodd\value{r2}%
-  \longsword%
-  \ifodd\value{r4}%
-    , \partialleather%
-  \fi%
-\else%
-  \greatsword, dagger%
-  \ifodd\value{r4}%
-    , \partialchain%
+\newcommand{\ghast}[1][\npc{\D\Hu}{Ghast}]{
+    #1
+    \randomtwo
+    \addtocounter{enc}{1}
+    \randomtwoB
+    \randomtwoC
+    \randomfour
+    \addtocounter{track}{-1}
+    \addtocounter{r2b}{-1}
+  \person{\arabic{track}}% STRENGTH
+  {\arabic{r2b}}% DEXTERITY 
+  {\arabic{r2c}}% SPEED
+  {{\arabic{enc}}% INTELLIGENCE
+  {0}% WITS
+  {-5}}% CHARISMA
+  {0}% DR
+  {2}% COMBAT
+  {}% SKILLS
+  {\ifnum\value{track}<3%
+    \longsword%
+    \ifodd\value{r2c}%
+      , \partialleather%
+    \fi%
+  \else%
+    \greatsword, dagger%
+    \ifodd\value{r2c}%
+      , \partialchain%
+    \fi%
   \fi%
-\fi%
-\ifodd\value{r3}, \lootJewellery\fi}% EQUIPMENT
-{
-  \undead
-}
+  \ifodd\value{r3}, \lootJewellery\fi}% EQUIPMENT
+  {
+    \ifodd\value{r3}%
+      \setcounter{Caving}{\value{r3}}
+    \else
+      \setcounter{Deceit}{\value{r3}}
+    \fi
+    \ifodd\value{r2}%
+      \setcounter{Athletics}{\value{r3b}}
+    \else
+      \setcounter{Tactics}{\value{r3b}}
+    \fi
+    \setcounter{Vigilance}{1}
+    \undead
+  }
 }
 
 \newcommand{\necromancer}[1][\npc{\M}{Necromancer}]{