diff --git a/tools/charactercreation/characterdata.xml b/tools/charactercreation/characterdata.xml
index c9ed3c3..9399913 100644
--- a/tools/charactercreation/characterdata.xml
+++ b/tools/charactercreation/characterdata.xml
@@ -50,6 +50,7 @@
                 <Int Name="maxheight"/>
                 <Int Name="minweight"/>
                 <Int Name="maxweight"/>
+                <Int Name="healthbonus"/>
             </Variables>
         </Group>
         <Group Name="attributes">
@@ -208,6 +209,9 @@
                 </List>
                 <String Name="new_name"/>
                 <String Name="new_description"/>
+                <Int Name="mana">
+                    <Value>10</Value>
+                </Int>
             </Variables>
         </Group>
         <Group Name="print">
diff --git a/tools/charactercreation/characterlib.xml b/tools/charactercreation/characterlib.xml
index 0e59904..fe985f0 100644
--- a/tools/charactercreation/characterlib.xml
+++ b/tools/charactercreation/characterlib.xml
@@ -40,5 +40,30 @@
         <Function Name="charlib_checkpreprint">
             <Return>true</Return>
         </Function>
+        <Function Name="charlib_intrinsicmagic">
+            <Actions>
+                <Action>
+                    <Do>if([data.character.attributes.courage] >= 10, 0.25, 0) + if([data.character.attributes.intelligence] >= 10, 0.25, 0) + if([data.character.attributes.intuition] >= 10, 0.25, 0) + if([data.character.attributes.charisma] >= 10, 0.25, 0) + if([data.character.attributes.dexterity] >= 10, 0.25, 0) + if([data.character.attributes.agility] >= 10, 0.25, 0) + if([data.character.attributes.physique] >= 10, 0.25, 0) + if([data.character.attributes.strength] >= 10, 0.25, 0)</Do>
+                    <Output>[local.sum10]</Output>
+                </Action>
+                <Action>
+                    <Do>if([data.character.attributes.courage] >= 12, 0.5, 0) + if([data.character.attributes.intelligence] >= 12, 0.5, 0) + if([data.character.attributes.intuition] >= 12, 0.5, 0) + if([data.character.attributes.charisma] >= 12, 0.5, 0) + if([data.character.attributes.dexterity] >= 12, 0.5, 0) + if([data.character.attributes.agility] >= 12, 0.5, 0) + if([data.character.attributes.physique] >= 12, 0.5, 0) + if([data.character.attributes.strength] >= 12, 0.5, 0)</Do>
+                    <Output>[local.sum10]</Output>
+                </Action>
+                <Action>
+                    <Do>if([data.character.attributes.courage] >= 14, 0.75, 0) + if([data.character.attributes.intelligence] >= 14, 0.75, 0) + if([data.character.attributes.intuition] >= 14, 0.75, 0) + if([data.character.attributes.charisma] >= 14, 0.75, 0) + if([data.character.attributes.dexterity] >= 14, 0.75, 0) + if([data.character.attributes.agility] >= 14, 0.75, 0) + if([data.character.attributes.physique] >= 14, 0.75, 0) + if([data.character.attributes.strength] >= 14, 0.75, 0)</Do>
+                    <Output>[local.sum10]</Output>
+                </Action>
+                <Action>
+                    <Do>if([data.character.attributes.courage] >= 16, 1, 0) + if([data.character.attributes.intelligence] >= 16, 1, 0) + if([data.character.attributes.intuition] >= 16, 1, 0) + if([data.character.attributes.charisma] >= 16, 1, 0) + if([data.character.attributes.dexterity] >= 16, 1, 0) + if([data.character.attributes.agility] >= 16, 1, 0) + if([data.character.attributes.physique] >= 16, 1, 0) + if([data.character.attributes.strength] >= 16, 1, 0)</Do>
+                    <Output>[local.sum10]</Output>
+                </Action>
+                <Action>
+                    <Do>Truncate(Min([local.sum10], 1.5) + Min([local.sum12], 2) + Min([local.sum14], 1.5) + Min([local.sum16], 1))</Do>
+                    <Output>[local.magic]</Output>
+                </Action>
+            </Actions>
+            <Return>[local.magic]</Return>
+        </Function>
     </Functions>
 </Library>
\ No newline at end of file
diff --git a/tools/charactercreation/characterpdf.xml b/tools/charactercreation/characterpdf.xml
index 827dda2..9d1f26b 100644
--- a/tools/charactercreation/characterpdf.xml
+++ b/tools/charactercreation/characterpdf.xml
@@ -74,90 +74,142 @@
                 </RowLayout>
             </Header>
             <Body>
-                <RowLayout Styles="ValueBoxRow">
-                    <Content>
-                        <ColumnLayout Styles="ValueBox;ValueBoxChildren;Courage">
-                            <Content>
-                                <Label>
-                                    <Text>"MU"</Text>
-                                </Label>
-                                <Label>
-                                    <Text>[data.character.attributes.courage]</Text>
-                                </Label>
-                            </Content>
+                <ColumnLayout>
+                    <RowLayout Styles="ValueBoxRow">
+                        <Content>
+                            <ColumnLayout Styles="ValueBox;ValueBoxChildren;Courage">
+                                <Content>
+                                    <Label>
+                                        <Text>"MU"</Text>
+                                    </Label>
+                                    <Label>
+                                        <Text>[data.character.attributes.courage]</Text>
+                                    </Label>
+                                </Content>
+                            </ColumnLayout>
+                            <ColumnLayout Styles="ValueBox;ValueBoxChildren;Intelligence">
+                                <Content>
+                                    <Label>
+                                        <Text>"KL"</Text>
+                                    </Label>
+                                    <Label>
+                                        <Text>[data.character.attributes.intelligence]</Text>
+                                    </Label>
+                                </Content>
+                            </ColumnLayout>
+                            <ColumnLayout Styles="ValueBox;ValueBoxChildren;Intuition">
+                                <Content>
+                                    <Label>
+                                        <Text>"IN"</Text>
+                                    </Label>
+                                    <Label>
+                                        <Text>[data.character.attributes.intuition]</Text>
+                                    </Label>
+                                </Content>
+                            </ColumnLayout>
+                            <ColumnLayout Styles="ValueBox;ValueBoxChildren;Charisma">
+                                <Content>
+                                    <Label>
+                                        <Text>"CH"</Text>
+                                    </Label>
+                                    <Label>
+                                        <Text>[data.character.attributes.charisma]</Text>
+                                    </Label>
+                                </Content>
+                            </ColumnLayout>
+                            <ColumnLayout Styles="ValueBox;ValueBoxChildren;Dexterity">
+                                <Content>
+                                    <Label>
+                                        <Text>"FF"</Text>
+                                    </Label>
+                                    <Label>
+                                        <Text>[data.character.attributes.dexterity]</Text>
+                                    </Label>
+                                </Content>
+                            </ColumnLayout>
+                            <ColumnLayout Styles="ValueBox;ValueBoxChildren;Agility">
+                                <Content>
+                                    <Label>
+                                        <Text>"GE"</Text>
+                                    </Label>
+                                    <Label>
+                                        <Text>[data.character.attributes.agility]</Text>
+                                    </Label>
+                                </Content>
+                            </ColumnLayout>
+                            <ColumnLayout Styles="ValueBox;ValueBoxChildren;Physique">
+                                <Content>
+                                    <Label>
+                                        <Text>"KO"</Text>
+                                    </Label>
+                                    <Label>
+                                        <Text>[data.character.attributes.physique]</Text>
+                                    </Label>
+                                </Content>
+                            </ColumnLayout>
+                            <ColumnLayout Styles="ValueBox;ValueBoxChildren;Strength">
+                                <Content>
+                                    <Label>
+                                        <Text>"KK"</Text>
+                                    </Label>
+                                    <Label>
+                                        <Text>[data.character.attributes.strength]</Text>
+                                    </Label>
+                                </Content>
+                            </ColumnLayout>
+                        </Content>
+                    </RowLayout>
+                    <RowLayout Styles="ValueBoxRow">
+                        <ColumnLayout Styles="ValueBox;ValueBoxChildren">
+                            <Label>
+                                <Text>"LE"</Text>
+                            </Label>
+                            <Label>
+                                <Text>[data.character.attributes.physique] + [data.character.attributes.physique] + [data.character.attributes.strength] + [data.character.race.healthbonus]</Text>
+                            </Label>
                         </ColumnLayout>
-                        <ColumnLayout Styles="ValueBox;ValueBoxChildren;Intelligence">
-                            <Content>
-                                <Label>
-                                    <Text>"KL"</Text>
-                                </Label>
-                                <Label>
-                                    <Text>[data.character.attributes.intelligence]</Text>
-                                </Label>
-                            </Content>
+                        <ColumnLayout Styles="ValueBox;ValueBoxChildren">
+                            <Label>
+                                <Text>"INI"</Text>
+                            </Label>
+                            <Label>
+                                <Text>Round(([data.character.attributes.courage] + [data.character.attributes.agility]) / 2)</Text>
+                            </Label>
                         </ColumnLayout>
-                        <ColumnLayout Styles="ValueBox;ValueBoxChildren;Intuition">
-                            <Content>
-                                <Label>
-                                    <Text>"IN"</Text>
-                                </Label>
-                                <Label>
-                                    <Text>[data.character.attributes.intuition]</Text>
-                                </Label>
-                            </Content>
+                        <ColumnLayout Styles="ValueBox;ValueBoxChildren">
+                            <Label>
+                                <Text>"AW"</Text>
+                            </Label>
+                            <Label>
+                                <Text>Round(([data.character.attributes.intuition] + [data.character.attributes.agility] + [data.character.attributes.agility]) / 4)</Text>
+                            </Label>
                         </ColumnLayout>
-                        <ColumnLayout Styles="ValueBox;ValueBoxChildren;Charisma">
-                            <Content>
-                                <Label>
-                                    <Text>"CH"</Text>
-                                </Label>
-                                <Label>
-                                    <Text>[data.character.attributes.charisma]</Text>
-                                </Label>
-                            </Content>
+                        <ColumnLayout Styles="ValueBox;ValueBoxChildren">
+                            <Label>
+                                <Text>"GS"</Text>
+                            </Label>
+                            <Label>
+                                <Text>[data.character.race.speed]</Text>
+                            </Label>
                         </ColumnLayout>
-                        <ColumnLayout Styles="ValueBox;ValueBoxChildren;Dexterity">
-                            <Content>
-                                <Label>
-                                    <Text>"FF"</Text>
-                                </Label>
-                                <Label>
-                                    <Text>[data.character.attributes.dexterity]</Text>
-                                </Label>
-                            </Content>
+                        <ColumnLayout Styles="ValueBox;ValueBoxChildren" Visible="[data.character.definition.ismage]">
+                            <Label>
+                                <Text>"MN"</Text>
+                            </Label>
+                            <Label>
+                                <Text>[data.character.magic.mana]</Text>
+                            </Label>
                         </ColumnLayout>
-                        <ColumnLayout Styles="ValueBox;ValueBoxChildren;Agility">
-                            <Content>
-                                <Label>
-                                    <Text>"GE"</Text>
-                                </Label>
-                                <Label>
-                                    <Text>[data.character.attributes.agility]</Text>
-                                </Label>
-                            </Content>
+                        <ColumnLayout Styles="ValueBox;ValueBoxChildren" Visible="[data.character.definition.ismage]">
+                            <Label>
+                                <Text>"AM"</Text>
+                            </Label>
+                            <Label>
+                                <Text>charlib_intrinsicmagic()</Text>
+                            </Label>
                         </ColumnLayout>
-                        <ColumnLayout Styles="ValueBox;ValueBoxChildren;Physique">
-                            <Content>
-                                <Label>
-                                    <Text>"KO"</Text>
-                                </Label>
-                                <Label>
-                                    <Text>[data.character.attributes.physique]</Text>
-                                </Label>
-                            </Content>
-                        </ColumnLayout>
-                        <ColumnLayout Styles="ValueBox;ValueBoxChildren;Strength">
-                            <Content>
-                                <Label>
-                                    <Text>"KK"</Text>
-                                </Label>
-                                <Label>
-                                    <Text>[data.character.attributes.strength]</Text>
-                                </Label>
-                            </Content>
-                        </ColumnLayout>
-                    </Content>
-                </RowLayout>
+                    </RowLayout>
+                </ColumnLayout>
             </Body>
             <!--<Footer></Footer>-->
         </Page>