diff --git a/tools/charactercreation/characterlib.xml b/tools/charactercreation/characterlib.xml
index 36e8cc1..a4161d0 100644
--- a/tools/charactercreation/characterlib.xml
+++ b/tools/charactercreation/characterlib.xml
@@ -21,6 +21,30 @@
         <Function Name="charlib_cost_attr">
             <Return>Max(1, [param.0] - 13) * 15</Return>
         </Function>
+        <Function Name="charlib_cost_mana">
+            <Actions>
+                <Action>
+                    <Do>2</Do>
+                    <Output>[local.price]</Output>
+                </Action>
+                <Action>
+                    <If>[param.0] > 20</If>
+                    <Do>3</Do>
+                    <Output>[local.price]</Output>
+                </Action>
+                <Action>
+                    <If>[param.0] > 25</If>
+                    <Do>4</Do>
+                    <Output>[local.price]</Output>
+                </Action>
+                <Action>
+                    <If>[param.0] > 30</If>
+                    <Do>2</Do>
+                    <Output>[local.price]</Output>
+                </Action>
+            </Actions>
+            <Return>[local.price]</Return>
+        </Function>
         <!--<Function Name="charlib_cost_b">
             <Actions>
                 <Action>
@@ -44,7 +68,7 @@
                     <Output>[local.sum]</Output>
                 </Action>
                 <ForLoop>
-                    <LoopCount>[param.0]</LoopCount>
+                    <LoopCount>[param.0] + 1</LoopCount>
                     <Loop>
                         <Action>
                             <Do>[local.sum] + charlib_magiccatprice([param.loop])</Do>
diff --git a/tools/charactercreation/charactertool.xml b/tools/charactercreation/charactertool.xml
index 7ecea1a..c813932 100644
--- a/tools/charactercreation/charactertool.xml
+++ b/tools/charactercreation/charactertool.xml
@@ -4041,6 +4041,54 @@
                     </Content>
                 </HorizontalContainer>
                 <!-- End Header Bar -->
+
+                <GridContainer>
+                    <Cols>3</Cols>
+                    <Content>
+                        <Label>
+                            <Text>"Angeborene Magie"</Text>
+                        </Label>
+                        <Label>
+                            <Text>charlib_intrinsicmagic()</Text>
+                        </Label>
+                        <Empty/>
+
+                        <Label>
+                            <Text>"Mana"</Text>
+                        </Label>
+                        <ValueAndBorders>
+                            <Value>[data.character.magic.mana]</Value>
+                            <LowerBorder>10</LowerBorder>
+                            <UpperBorder>40</UpperBorder>
+                        </ValueAndBorders>
+                        <ValueButtons>
+                            <Output>[data.character.magic.mana]</Output>
+                            <Budget>[data.character.control.xp]</Budget>
+                            <Cost>charlib_cost_mana</Cost>
+                            <Min>10</Min>
+                            <Max>40</Max>
+                            <Buttons>
+                                <ValueButton>
+                                    <Value>+5</Value>
+                                </ValueButton>
+                                <ValueButton>
+                                    <Value>+1</Value>
+                                </ValueButton>
+                                <ValueButton>
+                                    <Value>-1</Value>
+                                </ValueButton>
+                                <ValueButton>
+                                    <Value>-5</Value>
+                                </ValueButton>
+                            </Buttons>
+                        </ValueButtons>
+                    </Content>
+                </GridContainer>
+
+                <Header>
+                    <Level>2</Level>
+                    <Text>"Magiekategorien"</Text>
+                </Header>
                 <ListDisplay>
                     <List>[data.character.magic.categories]</List>
                     <AllowRemove>true</AllowRemove>