diff --git a/enabled.html b/enabled.html
index 89fe28f8..9979967d 100644
--- a/enabled.html
+++ b/enabled.html
@@ -18,7 +18,7 @@
   <script src="jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
       $(function() {          
-          $("img").lazyload({placeholder : "img/grey.gif"});
+          $("img").lazyload({placeholder : "img/grey.gif", event : "click"});
       });
   </script>  
   <style type="text/css">
diff --git a/jquery.lazyload.js b/jquery.lazyload.js
index ca139d12..84e1e4c7 100644
--- a/jquery.lazyload.js
+++ b/jquery.lazyload.js
@@ -1,7 +1,7 @@
 /*
  * Lazy Load - jQuery plugin for lazy loading images
  *
- * Copyright (c) 2007 Mika Tuupola
+ * Copyright (c) 2007-2008 Mika Tuupola
  *
  * Licensed under the MIT license:
  *   http://www.opensource.org/licenses/mit-license.php
@@ -32,8 +32,7 @@
                 elements.each(function() {
                     if (!$.belowthefold(this, settings) &&
                         !$.rightoffold(this, settings)) {
-                            $(this).attr("src", $(this).attr("original"));
-                            this.loaded = true;
+                            $(this).trigger("appear");  
                     } else {
                         if (counter++ > settings.failurelimit) {
                             return false;
@@ -71,12 +70,24 @@
             } else {
                 self.loaded = true;
             }
+            
+            $(self).bind("appear", function() {
+//                console.log("appear");
+                $("<img>")
+                    .attr("src", $(self).attr("original"))
+                    .bind("load", function() {
+                        $(self)
+//                            .hide()
+                            .attr("src", $(self).attr("original"));
+//                            .fadeIn("fast");
+                        self.loaded = true;
+                    });
+            });
 
             if (settings.event) {
                 $(self)[settings.event](function(event) {
                     if (!self.loaded) {
-                        $(self).attr("src", $(self).attr("original"));   
-                        self.loaded = true;
+                        $(self).trigger("appear");
                     }
                 });
             }