diff --git a/airtime_mvc/application/forms/SmartPlaylistCriteria.php b/airtime_mvc/application/forms/SmartPlaylistCriteria.php
index 808062ae1..273dd45f7 100644
--- a/airtime_mvc/application/forms/SmartPlaylistCriteria.php
+++ b/airtime_mvc/application/forms/SmartPlaylistCriteria.php
@@ -226,6 +226,13 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
         $generate->setLabel('Generate');
         $generate->setDecorators(array('viewHelper'));
         $this->addElement($generate);
+        
+        $shuffle = new Zend_Form_Element_Button('shuffle_button');
+        $shuffle->setAttrib('class', 'ui-button ui-state-default right-floated');
+        $shuffle->setIgnore(true);
+        $shuffle->setLabel('Shuffle');
+        $shuffle->setDecorators(array('viewHelper'));
+        $this->addElement($shuffle);
     }
     
     
diff --git a/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml
index 8df34f212..9cb42c929 100644
--- a/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml
+++ b/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml
@@ -25,7 +25,8 @@
         
                 <?php echo $this->element->getElement('sp_criteria_field_'.$i) ?>
                 <?php echo $this->element->getElement('sp_criteria_modifier_'.$i) ?>
-                <?php echo $this->element->getElement('sp_criteria_value_'.$i) ?><span id="extra_criteria" <?php echo $this->element->getElement('sp_criteria_extra_'.$i)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>> to <?php echo $this->element->getElement('sp_criteria_extra_'.$i) ?></span> 
+                <?php echo $this->element->getElement('sp_criteria_value_'.$i) ?>
+                    <span id="extra_criteria" <?php echo $this->element->getElement('sp_criteria_extra_'.$i)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>> to <?php echo $this->element->getElement('sp_criteria_extra_'.$i) ?></span> 
                 <a class='ui-button sp-ui-button-icon-only' id='criteria_remove_<?php echo $i ?>'>
                     <span class='ui-icon ui-icon-closethick'></span>
                 </a>
@@ -46,6 +47,7 @@
        <dd id='action_buttons'> 
            <?php echo $this->element->getElement('save_button') ?>
            <?php echo $this->element->getElement('generate_button') ?>
+           <?php echo $this->element->getElement('shuffle_button') ?>
        </dd>
         
 </dl>
diff --git a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
index 222a2a95c..d4734d7fc 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
@@ -1,6 +1,5 @@
 $(document).ready(function() {
     setSmartPlaylistEvents();
-    setupUI();
 });
 
 function setSmartPlaylistEvents() {
@@ -111,7 +110,9 @@ function setSmartPlaylistEvents() {
             save_action = 'Playlist/smart-playlist-criteria-save',
             playlist_id = $('input[id="pl_id"]').val();
         
-        $.post(save_action, {format: "json", data: data, pl_id: playlist_id}, saveCallback);
+        $.post(save_action, {format: "json", data: data, pl_id: playlist_id}, function(data){
+            callback(data, "save");
+        });
     });
     
     form.find('button[id="generate_button"]').live("click", function(event){
@@ -120,7 +121,20 @@ function setSmartPlaylistEvents() {
             generate_action = 'Playlist/smart-playlist-generate',
             playlist_id = $('input[id="pl_id"]').val();
 		
-        $.post(generate_action, {format: "json", data: data, pl_id: playlist_id}, generateCallback);
+        $.post(generate_action, {format: "json", data: data, pl_id: playlist_id}, function(data){
+            callback(data, "generate");
+        });
+    });
+    
+    form.find('button[id="shuffle_button"]').live("click", function(event){
+        var playlist_type = form.find('input:radio[name=sp_type]:checked').val(),
+            data = $('form').serializeArray(),
+            shuffle_action = 'Playlist/smart-playlist-shuffle',
+            playlist_id = $('input[id="pl_id"]').val();
+		
+        $.post(shuffle_action, {format: "json", data: data, pl_id: playlist_id}, function(data){
+            callback(data, "shuffle");
+        });
     });
 	
     form.find('dd[id="sp_type-element"]').live("change", function(){
@@ -148,6 +162,7 @@ function setSmartPlaylistEvents() {
         }
     });
     
+    setupUI();
     appendAddButton();
     removeButtonCheck();
 }
@@ -156,10 +171,12 @@ function setupUI() {
     var playlist_type = $('input:radio[name=sp_type]:checked').val();
     if (playlist_type == "0") {
         $('button[id="generate_button"]').show();
+        $('button[id="shuffle_button"]').show();
         $('#spl_sortable').unblock();
         $('#library_content').unblock();
     } else {
         $('button[id="generate_button"]').hide();
+        $('button[id="shuffle_button"]').hide();
         $('#spl_sortable').block({
             message: "",
             theme: true,
@@ -217,10 +234,42 @@ function populateModifierSelect(e) {
     }
 }
 
-function generateCallback(data) {
-    var form = $('#smart-playlist-form');
+function callback(data, type) {
+    var form = $('#smart-playlist-form'),
+    json = $.parseJSON(data);
+
+    form.find('span[class="errors sp-errors"]').remove();
+	
+    if (json.result == "1") {
+        form.find('.success').hide();
+        $.each(json.errors, function(index, error){
+            $.each(error.msg, function(index, message){
+                $('#'+error.element).parent().append("<span class='errors sp-errors'>"+message+"</span>");
+            });
+        });
+    } else {
+        if (type == 'shuffle' || type == 'generate') {
+            AIRTIME.playlist.fnOpenPlaylist(json);
+            form = $('#smart-playlist-form');
+            if (type == 'shuffle') {
+                form.find('.success').text('Playlist shuffled');
+            } else {
+            	form.find('.success').text('Smart playlist generated');
+            }
+    	    form.find('.success').show();
+    	    form.find('#smart_playlist_options').removeClass("closed");
+        } else {
+            form.find('.success').text('Criteria saved');
+            form.find('.success').show();
+        }
+    }
+}
+
+/*function generateCallback(data) {
+    var form = $('#smart-playlist-form'),
+        json = $.parseJSON(data);
+    
     form.find('span[class="errors sp-errors"]').remove();
-    var json = $.parseJSON(data);
     
     if (json.result == "1") {
         form.find('.success').hide();
@@ -231,6 +280,7 @@ function generateCallback(data) {
         });
     } else {
         AIRTIME.playlist.fnOpenPlaylist(json);
+        form = $('#smart-playlist-form')
         form.find('.success').text('Smart playlist generated');
         form.find('.success').show();
         form.find('#smart_playlist_options').removeClass("closed");
@@ -238,9 +288,11 @@ function generateCallback(data) {
 }
 
 function saveCallback(json) {
-	var form = $('#smart-playlist-form');
+	var form = $('#smart-playlist-form'),
+	    json = $.parseJSON(json);
+
 	form.find('span[class="errors sp-errors"]').remove();
-	var json = $.parseJSON(json);
+	
 	if (json.result == "1") {
 		form.find('.success').hide();
         $.each(json.errors, function(index, error){
@@ -252,7 +304,7 @@ function saveCallback(json) {
     	form.find('.success').text('Criteria saved');
         form.find('.success').show();
     }
-}
+}*/
 
 function appendAddButton() {
     var rows = $('#smart-playlist-form');