diff --git a/mod_carousel.php b/mod_carousel.php
index 81a0934..930eb41 100644
--- a/mod_carousel.php
+++ b/mod_carousel.php
@@ -16,12 +16,13 @@
 //store params as object that we can loop through in tmpl/default.php
 $slideritems = new stdClass;
 
-<<<<<<< HEAD
-for ($i=1; $i <= 3; $i++) { 
-        $slideritems->$i = new stdClass;
-=======
+$carousel_id = $params->get('carousel_id', 'myCarousel');
+
+
+for ($i=1; $i <= 6; $i++) $slideritems->$i = new stdClass;
+
 for ($i=1; $i <= 6; $i++) { 
->>>>>>> 6248772a906d6369fc6cafe301b56bd883689c50
+
 	$slideritems->$i->heading = $params->get("slide".$i."_heading");
 	$slideritems->$i->text = $params->get("slide".$i."_text");
 	$slideritems->$i->background_image = $params->get("slide".$i."_background_image");
@@ -29,13 +30,11 @@
 	$slideritems->$i->button_text = $params->get("slide".$i."_button_text");
 	$slideritems->$i->button_link = $params->get("slide".$i."_button_link");
 	$slideritems->$i->show_read_more = $params->get("slide".$i."_show_read_more");
+	$slideritems->$i->caption_class = $params->get("slide".$i."_caption_class");
 }
 
 //more options
 $custom_style = $params->get('custom_style');
-$slide1_caption_class = $params->get('slide1_caption_class');
-$slide2_caption_class = $params->get('slide2_caption_class');
-$slide3_caption_class = $params->get('slide3_caption_class');
 
 // Include the syndicate functions only once
 require_once dirname(__FILE__).'/helper.php';
diff --git a/mod_carousel.xml b/mod_carousel.xml
index 1ad4bcd..9d8d42c 100644
--- a/mod_carousel.xml
+++ b/mod_carousel.xml
@@ -27,7 +27,9 @@
                         label="Module Class Suffix" 
                         description="tag on a css class to the module wrap">
                     </field>
-					
+
+                    <field name="carousel_id" type="text" default="myCarousel" label="Carousel ID" description="Carousel ID , for case you are using more than one module on the same page."></field>
+
 					<field name="slide1_heading" type="text" default="" label="Slide 1 Heading" description="The heading for slide 1"></field>
 					<field name="slide1_text" type="textarea" default="" label="Slide 1 Text" description="The body text for slide 1"></field>
 					<field name="slide1_background_image" type="media" directory="stories" label="Slide 1 Background Image" description="This image should be at least the width of the module" />
@@ -38,6 +40,7 @@
                          <option value="1">Yes</option>
                         <option value="0">No</option>
                     </field>
+                    <field name="slide1_caption_class" type="text" default="" label="Slide 1 Caption Class" description="The caption class for slide 1"></field>
 					
 					<field name="slide2_heading" type="text" default="" label="Slide 2 Heading" description="The heading for slide 2"></field>
 					<field name="slide2_text" type="textarea" default="" label="Slide 2 Text" description="The body text for slide 2"></field>
@@ -49,6 +52,7 @@
                          <option value="1">Yes</option>
                         <option value="0">No</option>
                     </field>
+                    <field name="slide2_caption_class" type="text" default="" label="Slide 2 Caption Class" description="The caption class for slide 2"></field>
 					
 					<field name="slide3_heading" type="text" default="" label="Slide 3 Heading" description="The heading for slide 3"></field>
 					<field name="slide3_text" type="textarea" default="" label="Slide 3 Text" description="The body text for slide 3"></field>
@@ -59,7 +63,8 @@
 					<field name="slide3_show_read_more" type="radio" default="1" label="Slide 3 Show Readmore" description="Choose to show a read more button">
                          <option value="1">Yes</option>
                         <option value="0">No</option>
-                    </field>   
+                    </field>
+                    <field name="slide3_caption_class" type="text" default="" label="Slide 3 Caption Class" description="The caption class for slide 3"></field>
 					
 					<field name="slide4_heading" type="text" default="" label="Slide 4 Heading" description="The heading for Slide 4"></field>
 					<field name="slide4_text" type="textarea" default="" label="Slide 4 Text" description="The body text for Slide 4"></field>
@@ -71,6 +76,7 @@
                          <option value="1">Yes</option>
                         <option value="0">No</option>
                     </field>
+                    <field name="slide4_caption_class" type="text" default="" label="Slide 4 Caption Class" description="The caption class for slide 4"></field>
 					
 					<field name="slide5_heading" type="text" default="" label="Slide 5 Heading" description="The heading for Slide 5"></field>
 					<field name="slide5_text" type="textarea" default="" label="Slide 5 Text" description="The body text for Slide 5"></field>
@@ -82,6 +88,7 @@
                          <option value="1">Yes</option>
                         <option value="0">No</option>
                     </field>
+                    <field name="slide5_caption_class" type="text" default="" label="Slide 5 Caption Class" description="The caption class for slide 5"></field>
 					
 					<field name="slide6_heading" type="text" default="" label="Slide 6 Heading" description="The heading for Slide 6"></field>
 					<field name="slide6_text" type="textarea" default="" label="Slide 6 Text" description="The body text for Slide 6"></field>
@@ -92,14 +99,13 @@
 					<field name="slide6_show_read_more" type="radio" default="1" label="Slide 6 Show Readmore" description="Choose to show a read more button">
                          <option value="1">Yes</option>
                         <option value="0">No</option>
-                    </field>   
+                    </field>
+                    <field name="slide6_caption_class" type="text" default="" label="Slide 6 Caption Class" description="The caption class for slide 6"></field>
                 </fieldset>
                 
                 <fieldset name="basic2" label="More options">
                   <field name="custom_style" type="textarea" default="" label="Custom Style" description="Add custom style for you carousel"></field>
-                  <field name="slide1_caption_class" type="text" default="" label="Slide 1 Caption Class" description="The caption class for slide 1"></field>
-                  <field name="slide2_caption_class" type="text" default="" label="Slide 2 Caption Class" description="The caption class for slide 2"></field>
-                  <field name="slide3_caption_class" type="text" default="" label="Slide 3 Caption Class" description="The caption class for slide 3"></field>
+
                 </fieldset>
         </fields>
     </config>
diff --git a/tmpl/default.php b/tmpl/default.php
index c6de64d..b5bd9e7 100644
--- a/tmpl/default.php
+++ b/tmpl/default.php
@@ -13,48 +13,63 @@
 
 </style>
  
- <div id="myCarousel" class="carousel slide">
+ <div id="<?php echo $carousel_id; ?>" class="carousel slide">
+
   <!-- Indicators -->
   <ol class="carousel-indicators">
-  <?php foreach ($slideritems as $key => $item) { 
-      $active = ($key == 1)? " active" : ""; ?>
+
+    <?php foreach ($slideritems as $key => $item) : ?>
+
+      <?php $active = ($key == 1)? " active" : ""; ?>
       <?php if ($item->main_image) : ?>
-    <li data-target="#myCarousel" data-slide-to="<?php echo ($key - 1); ?>" class="<?php echo $active; ?>"></li>
-    <?php endif; ?>
-  <?php } ?>
+        <li data-target="#<?php echo $carousel_id; ?>" data-slide-to="<?php echo ($key - 1); ?>" class="<?php echo $active; ?>"></li>
+      <?php endif; ?>
+
+    <?php endforeach; ?>
+
   </ol>
 
   <!-- Wrapper for slides -->
   <div class="carousel-inner">
-    <?php foreach ($slideritems as $key => $item) {
-      $active = ($key == 1)? " active" : ""; ?>
+
+    <?php foreach ($slideritems as $key => $item) : ?>
+
+      <?php $active = (($key == 1) ? " active" : ""); ?>
+
       <?php if ($item->main_image) : ?>
-      <div class="item<?php echo $active; ?>">
-        <div class="carousel-caption">
+
+        <div class="item<?php echo $active; ?>">
+          <div class="carousel-caption<?php echo $item->caption_class; ?>">
             <h1 class="carousel-title"><?php echo $item->heading; ?></h1>
             <?php if($item->text != "no") : ?>
-            <p class="carousel-body"><?php echo $item->text; ?></p>
-      <?php endif; ?>
+              <p class="carousel-body"><?php echo $item->text; ?></p>
+            <?php endif; ?>
+
             <?php if($item->show_read_more) : ?>
-             <p><?php if($item->button_link) : ?><a class="btn btn-link" href="<?php echo $item->button_link; ?>" role="button"><?php endif; ?><?php echo $item->button_text; ?><?php if($item->button_link) : ?></a><?php endif; ?></p>
-        <?php endif; ?>
-    </div>
-        <?php if($item->main_image) : ?>
-          <div class="carousel-image">
-             <?php if($item->button_link) : ?><a href="<?php echo $item->button_link; ?>"><?php endif; ?><img class="server" src="<?php echo JURI::base(); ?><?php echo $item->main_image; ?>" alt="<?php echo($item->heading && $item->heading != "Slide " . $key . " Heading" ? $item->heading : ""); ?>" /><?php if($item->button_link) : ?></a><?php endif; ?>
-    </div>
-      <?php endif; ?>
-    </div>
+              <p><?php if($item->button_link) : ?><a class="btn btn-link" href="<?php echo $item->button_link; ?>" role="button"><?php endif; ?><?php echo $item->button_text; ?><?php if($item->button_link) : ?></a><?php endif; ?></p>
+            <?php endif; ?>
+          </div>
+
+          <?php if($item->main_image) : ?>
+            <div class="carousel-image">
+              <?php if($item->button_link) : ?><a href="<?php echo $item->button_link; ?>"><?php endif; ?><img class="server" src="<?php echo JURI::base(); ?><?php echo $item->main_image; ?>" alt="<?php echo($item->heading && $item->heading != "Slide " . $key . " Heading" ? $item->heading : ""); ?>" /><?php if($item->button_link) : ?></a><?php endif; ?>
+            </div>
+          <?php endif; ?>
+
+        </div>
+
       <?php endif; ?>
-    <?php } ?>
-    </div>
+
+    <?php endforeach; ?>
+
+  </div>
 
   <!-- Controls -->
-        <a class="left carousel-control" href="#myCarousel" data-slide="prev">
-          <span class="icon-prev"></span>
-        </a>
-        <a class="right carousel-control" href="#myCarousel" data-slide="next">
-          <span class="icon-next"></span>
-        </a>
+  <a class="left carousel-control" href="#<?php echo $carousel_id; ?>" data-slide="prev">
+    <span class="icon-prev"></span>
+  </a>
+  <a class="right carousel-control" href="#<?php echo $carousel_id; ?>" data-slide="next">
+    <span class="icon-next"></span>
+  </a>
+
 </div>
->>>>>>> 6248772a906d6369fc6cafe301b56bd883689c50