diff --git a/binaries/data/mods/public/art/actors/fauna/camel.xml b/binaries/data/mods/public/art/actors/fauna/camel.xml
index b2221f10dc..16599989d5 100644
--- a/binaries/data/mods/public/art/actors/fauna/camel.xml
+++ b/binaries/data/mods/public/art/actors/fauna/camel.xml
@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
-    <variant frequency="1" name="Mesh">
+    <variant frequency="1" name="camel">
       <mesh>skeletal/camel_1.dae</mesh>
-      <texture>skeletal/animal_camel2.dds</texture>
+      <texture>skeletal/animal_camel.png</texture>
     </variant>
   </group>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/geology/light.xml b/binaries/data/mods/public/art/actors/geology/light.xml
deleted file mode 100644
index 354ad0749f..0000000000
--- a/binaries/data/mods/public/art/actors/geology/light.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <texture>gaia/wrld_med_plant.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant name="a">
-      <mesh>gaia/wrld_rock_1.pmd</mesh>
-    </variant>
-    <variant name="b">
-      <mesh>gaia/wrld_rock_2.pmd</mesh>
-    </variant>
-    <variant name="c">
-      <mesh>gaia/wrld_rock_3.pmd</mesh>
-    </variant>
-    <variant name="d">
-      <mesh>gaia/wrld_rock_4.pmd</mesh>
-    </variant>
-    <variant name="e">
-      <mesh>gaia/wrld_rock_5.pmd</mesh>
-    </variant>
-    <variant name="f">
-      <mesh>gaia/wrld_rock_6.pmd</mesh>
-    </variant>
-    <variant name="g">
-      <mesh>gaia/wrld_rock_7.pmd</mesh>
-    </variant>
-    <variant name="h">
-      <mesh>gaia/wrld_rock_8.pmd</mesh>
-    </variant>
-  </group>
-
-</actor>
diff --git a/binaries/data/mods/public/art/meshes/skeletal/camel_1.dae b/binaries/data/mods/public/art/meshes/skeletal/camel_1.dae
index 7bf7d6597f..39573ad922 100644
--- a/binaries/data/mods/public/art/meshes/skeletal/camel_1.dae
+++ b/binaries/data/mods/public/art/meshes/skeletal/camel_1.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d2ab683bb010a094582dfc948b6ec2256f3a654845e4cafd2afc053c1f48bcc
-size 67477
+oid sha256:69f974f78539c0b126b095e7413841e414709bbbee86aa5986d9b00ebd18bfd4
+size 122915
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/animal_camel.png b/binaries/data/mods/public/art/textures/skins/skeletal/animal_camel.png
new file mode 100644
index 0000000000..a4afc907dd
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/animal_camel.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:474d391dc2a05d129ec7bec1be5ff8b612b1b476d26761dfca1666a345464d66
+size 86456
diff --git a/binaries/data/mods/public/maps/scenarios/Gold_Rush.xml b/binaries/data/mods/public/maps/scenarios/Gold_Rush.xml
index a45868d4be..2719b13125 100644
--- a/binaries/data/mods/public/maps/scenarios/Gold_Rush.xml
+++ b/binaries/data/mods/public/maps/scenarios/Gold_Rush.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1317a759ed47efba32787c324ce66728596413493c6b669286d9798b9e3f7b74
-size 168952
+oid sha256:5c6e8a7ab14883101c4e3695684fce08b6e63e7a29e59cadd6d7082d855365a8
+size 173369
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
new file mode 100644
index 0000000000..b4c277e3d8
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_hunt_skittish">
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Camel</SpecificName>
+	<IconCell>23</IconCell>
+  </Identity>
+  <ResourceSupply>
+    <Amount>200</Amount>
+  </ResourceSupply>
+  <UnitMotion>
+    <WalkSpeed>2.0</WalkSpeed>
+    <Run>
+      <Speed>10.0</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <Footprint>
+    <Circle radius="1.75"/>
+    <Height>3.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Unit radius="1.5"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>fauna/camel.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
index 2242cb04d5..add6793b2d 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
@@ -23,4 +23,20 @@
   <Obstruction>
     <Unit radius="3.0"/>
   </Obstruction>
+  <Attack>
+    <Melee>
+      <Hack>10.0</Hack>
+      <Pierce>10.0</Pierce>
+      <Crush>10.0</Crush>
+      <MaxRange>4.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+    <Charge>
+      <Hack>30.0</Hack>
+      <Pierce>30.0</Pierce>
+      <Crush>30.0</Crush>
+      <MaxRange>4.0</MaxRange>
+      <MinRange>0.0</MinRange>
+    </Charge>
+  </Attack>
 </Entity>