diff --git a/modules/text_marquee/_widget.html.erb b/modules/text_marquee/_widget.html.erb
index 1831ff4..a0ca396 100644
--- a/modules/text_marquee/_widget.html.erb
+++ b/modules/text_marquee/_widget.html.erb
@@ -3,35 +3,28 @@
 		<li>{{content}}</li>
 	</ul>
 </div>
- 
+
 <script type="text/javascript">
 	(function(){
 		var main_div = $("div[data-subpart-id={{subpart-id}}]"),
 			total_texts = main_div.find("ul li").length - 1,
 			current_text = 0,
 			last_text = 0;
-
 		main_div.find("ul li").hide();
-		var textTransform = function(){
-			current_text++;
+		function textTransform(){
 			current_text = (current_text > total_texts ? 0 : current_text);
 			last_text = (current_text == 0 ? total_texts : current_text - 1);
-			speed = $('.marquee > li > a').eq(current_text).attr('speed');
-			main_div.find("ul li").eq(last_text).slideUp(500);
-			main_div.find("ul li").eq(current_text).slideDown(500);
+			speed = main_div.find("ul li > a").eq(0).attr('speed');
+			main_div.find("ul li").eq(last_text).slideUp({duration: 500, queue: true});
+			main_div.find("ul li").eq(current_text).slideDown({duration: 500, queue: true});
+			current_text++;
 			if(total_texts > 0){
-				setTimeout(textTransform,speed);
+				if(window["{{subpart-id}}_time_out_id"])
+					clearTimeout(window["{{subpart-id}}_time_out_id"]);
+				window["{{subpart-id}}_time_out_id"] = setTimeout(textTransform,speed);
 			}
+			return;
 		}
-		setTimeout(textTransform,500);
+		textTransform();
 	})();
-</script>
-	
-<script type="text/javascript">
-	(function(){
-		var main_div = $("div[data-subpart-id={{subpart-id}}]")
-	})()
-</script>
-	
-
-
+</script>
\ No newline at end of file