diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index ea584b76c..0e2e9b4fe 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -239,6 +239,11 @@ SQL;
         $offset = 0;
         foreach ($rows as &$row) {
             $clipSec = Application_Common_DateHelper::playlistTimeToSeconds($row['length']);
+            $row['trackSec'] = $clipSec;
+            
+            $row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']);
+            $row['cueOutSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cueout']);
+            
             $offset += $clipSec;
             $offset_cliplength = Application_Common_DateHelper::secondsToPlaylistTime($offset);
 
diff --git a/airtime_mvc/application/views/scripts/playlist/set-fade.phtml b/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
index 8f57d3cce..6a300eeee 100644
--- a/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
@@ -1,17 +1,21 @@
-<div data-fadeout="<?php echo $this->item1Url; ?>" data-fadein="<?php echo $this->item2Url; ?>"><input type="button" class="pl-waveform-fades-btn" value="Show Waveform"></input></div>
 <dl id="spl_editor" class="inline-list">
+	<dd>
+	  <input type="button" class="pl-waveform-fades-btn" value="Show Waveform"></input>
+	</dd>
     <?php if ($this->item1Type == 0) {?>
     <dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
-    <dd id="spl_fade_out_<?php echo $this->item1; ?>" class="spl_fade_out">
+    <dd id="spl_fade_out_<?php echo $this->item1; ?>" class="spl_fade_out" data-fadeout="<?php echo $this->item1Url; ?>"
+    	data-cuein="<?php echo $this->cueIn1; ?>" data-cueout="<?php echo $this->cueOut1; ?>">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->fadeOut; ?></span>
     </dd>
     <dd class="edit-error"></dd>
     <?php }
     if ($this->item2Type == 0) {?>
     <dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
-    <dd id="spl_fade_in_<?php echo $this->item2; ?>" class="spl_fade_in">
+    <dd id="spl_fade_in_<?php echo $this->item2; ?>" class="spl_fade_in" data-fadein="<?php echo $this->item2Url; ?>" data-offset="<?php echo $this->offset; ?>"
+    	data-cuein="<?php echo $this->cueIn2; ?>" data-cueout="<?php echo $this->cueOut2; ?>">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->fadeIn; ?></span>
     </dd>
-     <dd class="edit-error"></dd>
+    <dd class="edit-error"></dd>
     <?php }?>
 </dl>
diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index d1d85324c..b0d2b6151 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -93,7 +93,13 @@ if (($i < count($items) -1) && ($items[$i+1]['type'] == 0)) {
                 'item1Url' => $fileUrl,
             	'item2Url' => $nextFileUrl,
                 'fadeOut' => $items[$i]['fadeout'],
-                'fadeIn' => $items[$i+1]['fadein'])); ?>
+                'fadeIn' => $items[$i+1]['fadein'],
+            	'offset' => $items[$i]['trackSec'],
+                'cueIn1' => $items[$i]['cueInSec'],
+            	'cueOut1' => $items[$i]['cueOutSec'],
+            	'cueIn2' => $items[$i+1]['cueInSec'],
+            	'cueOut2' => $items[$i+1]['cueOutSec'])
+            ); ?>
         </div>
         <?php endif; ?>
         <?php if ($item['type'] == 2) {?>
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 2aecd99a3..39cbbe7d2 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -1111,14 +1111,21 @@ var AIRTIME = (function(AIRTIME){
 	
 	mod.showFadesWaveform = function(e) {
 		var $el = $(e.target),
-			$parent = $el.parent(),
+			$parent = $el.parents("dl"),
+			$fadeOut = $parent.find(".spl_fade_out"),
+			$fadeIn = $parent.find(".spl_fade_in"),
 			$html = $($("#tmpl-pl-fades").html()),
 			tracks = [
 			    {
-			    	src: $parent.data("fadeout")
+			    	src: $fadeOut.data("fadeout"),
+			    	cuein: $fadeOut.data("cuein"),
+			    	cueout: $fadeOut.data("cueout")
 				},
 				{
-			    	src: $parent.data("fadein")
+			    	src: $fadeIn.data("fadein"),
+			    	start: $fadeIn.data("offset"),
+			    	cuein: $fadeIn.data("cuein"),
+			    	cueout: $fadeIn.data("cueout")
 				}
 			],
 			dim = AIRTIME.utilities.findViewportDimensions();
diff --git a/airtime_mvc/public/js/waveformplaylist/playlist.js b/airtime_mvc/public/js/waveformplaylist/playlist.js
index 92887c0c6..35927769e 100644
--- a/airtime_mvc/public/js/waveformplaylist/playlist.js
+++ b/airtime_mvc/public/js/waveformplaylist/playlist.js
@@ -304,6 +304,22 @@ PlaylistEditor.prototype.updateEditor = function() {
     } 
 };
 
+PlaylistEditor.prototype.getJson = function() {
+    var editors = this.trackEditors,
+        i,
+        len,
+        info = [],
+        json;
+
+    for (i = 0, len = editors.length; i < len; i++) {
+        info.push(editors[i].getTrackDetails());
+    }
+
+    json = JSON.stringify(info);
+
+    return info;
+};
+
 PlaylistEditor.prototype.save = function() {
      var editors = this.trackEditors,
         i,