diff --git a/npcs.pdf b/npcs.pdf
index d7dbfa2..299de16 100644
Binary files a/npcs.pdf and b/npcs.pdf differ
diff --git a/npcs.tex b/npcs.tex
index 83942b3..43048a5 100644
--- a/npcs.tex
+++ b/npcs.tex
@@ -2,7 +2,7 @@
 
 \input{star-wars-formatting.sty}
 
-\newcommand{\nemesis}[6]{%
+\newcommand{\nemesis}[5]{%
     \begin{center}
         \Characteristics{\StrChar{#1}{1}}{\StrChar{#1}{3}}{\StrChar{#1}{5}}{\StrChar{#1}{7}}{\StrChar{#1}{9}}{\StrChar{#1}{11}}
     \end{center}
@@ -11,7 +11,7 @@
         \Derived{Soak Value}{#2}
         \Derived{W. Threshold}{#3}
         \Derived{S. Threshold}{#4}
-        \DerivedSplit{m/r Defense}{#5}{#6}
+        \DerivedSplit{m/r Defense}{\StrChar{#5}{1}}{\StrChar{#5}{3}}
     \end{center}
 }
 
@@ -21,7 +21,7 @@
 \begin{minipage}[t]{0.48\textwidth}
     \subsection{Morrigan Vex [Rival]}
 
-    \nemesis{4,2,3,4,3,2}{4}{14}{15}{2}{1}
+    \nemesis{4,2,3,4,3,2}{4}{14}{15}{2,1}
 
     \begin{itemize}[noitemsep]
         \item \textbf{Skills:} \begin{itemize}[noitemsep]
@@ -53,7 +53,9 @@
     \end{itemize}
 \end{minipage} \hfil \hspace{15pt}
 \begin{minipage}[t]{0.48\textwidth}
-    ,
+    \subsection{Test [Rival]}
+
+    \nemesis{1,1,1,1,1,1}{1}{11}{11}{0,0}
 \end{minipage}
 \end{center}
 \newpage
@@ -61,7 +63,7 @@
 \begin{minipage}[t]{0.48\textwidth}
     \subsection{Binto Bessum [Nemesis]}
 
-    \nemesis{2,4,5,3,4,5}{5}{18}{24}{3}{3}
+    \nemesis{2,4,5,3,4,5}{5}{18}{24}{3,3}
 
     \begin{itemize}[noitemsep]
         \item \textbf{Skills:} \begin{itemize}[noitemsep]
diff --git a/star-wars-formatting.sty b/star-wars-formatting.sty
index 945ab3d..f98b3c4 100644
--- a/star-wars-formatting.sty
+++ b/star-wars-formatting.sty
@@ -543,18 +543,18 @@
 
 \newcommand\Derived[2]{\noindent
 \begin{tikzpicture}
-\node[chamfered rectangle, draw, thick, inner sep=0mm, chamfered rectangle corners={north west, north east, south west, south east}] (named) {
-\tikz\node[label={[chamfered rectangle, draw, thick, fill=charblue, inner sep=0mm, chamfered rectangle corners={north west, north east, south west, south east}, font=\tiny\tn\color{white}, minimum height=4mm, minimum width=17mm]above: \uppercase{#1}}] (inner) {\large\tn #2};
-};
+  \node[chamfered rectangle, draw, thick, inner sep=0mm, chamfered rectangle corners={north west, north east, south west, south east}] (named) {
+  \tikz\node[label={[chamfered rectangle, draw, thick, fill=charblue, inner sep=0mm, chamfered rectangle corners={north west, north east, south west, south east}, font=\tiny\tn\color{white}, minimum height=4mm, minimum width=17mm]above: \uppercase{#1}}] (inner) {\large\tn #2};
+  };
 \end{tikzpicture}
 }
 
 \newcommand\DerivedSplit[3]{\noindent
 \begin{tikzpicture}
-\draw[ultra thick] (0.88,-0.2) -- (0.88,-1.11);
-\node[chamfered rectangle, draw, thick, inner sep=0mm, chamfered rectangle corners={north west, north east, south west, south east}] (named) {
-\tikz\node[label={[chamfered rectangle, draw, thick, fill=charblue, inner sep=0mm, chamfered rectangle corners={north west, north east, south west, south east}, font=\tiny\tn\color{white}, minimum height=4mm, minimum width=17mm]above:\uppercase{#1}}] (inner) {\large\tn #2\hspace{18pt}#3};
-};
+  \draw[ultra thick] (0.88,-0.2) -- (0.88,-1.11);
+  \node[chamfered rectangle, draw, thick, inner sep=0mm, chamfered rectangle corners={north west, north east, south west, south east}] (named) {
+  \tikz\node[label={[chamfered rectangle, draw, thick, fill=charblue, inner sep=0mm, chamfered rectangle corners={north west, north east, south west, south east}, font=\tiny\tn\color{white}, minimum height=4mm, minimum width=17mm]above:\uppercase{#1}}] (inner) {\large\tn #2\hspace{18pt}#3};
+  };
 \end{tikzpicture}
 }