diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h
index ee219132e77..de104237361 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h
@@ -22,6 +22,7 @@
 #define CGAL_KINETIC_IO_INTERNAL_QT_TIMER_H
 #include <map>
 #include <qtimer.h>
+#include <CGAL/Kinetic/Listener.h>
 namespace CGAL
 {
   namespace Kinetic
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h
index 8a58057dd85..f0effd36b03 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h
@@ -24,6 +24,7 @@
 #include <CGAL/Kinetic/basic.h>
 #include <CGAL/IO/Qt_widget.h>
 #include <qmainwindow.h>
+#include <CGAL/Kinetic/Listener.h>
 
 namespace CGAL
 {
diff --git a/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h b/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h
index 5bbbb3d0a2b..9c5ed141df4 100644
--- a/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h
+++ b/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h
@@ -134,6 +134,33 @@
     return !operator>(o);						\
   }
 
+#define CGAL_COMPARISONS3(a, b, c) bool operator==(const This &o) const { \
+    return (a== o.a && b== o.b && c == o.c);				\
+  }									\
+  bool operator!=(const This &o) const {				\
+    return (a!= o.a || b != o.b || c != o.c);				\
+  }									\
+  bool operator<(const This &o) const {					\
+    if (a < o.a ) return true;						\
+    else if (a > o.a) return false;					\
+    else if (b < o.b) return true;					\
+    else if (b > o.b) return false;					\
+    else return c < o.c;						\
+  }									\
+  bool operator>(const This &o) const {					\
+    if (a > o.a ) return true;						\
+    else if (a < o.a) return false;					\
+    else if (b > o.b) return true;					\
+    else if (b < o.b) return false;					\
+    else return c > o.c;						\
+  }									\
+  bool operator>=(const This &o) const {				\
+    return !operator<(o);						\
+  }									\
+  bool operator<=(const This &o) const {				\
+    return !operator>(o);						\
+  }
+
 
 #endif
 
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_timer.cpp b/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_timer.cpp
index 47d28d34831..0cbc90bdc08 100644
--- a/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_timer.cpp
+++ b/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_timer.cpp
@@ -40,6 +40,7 @@ void Qt_timer::run(double time_in_seconds) {
 
 void Qt_timer::timerDone() {
   ++tick_;
-  cb_->new_notification(Listener::TICKS);
+  CGAL_KINETIC_NOTIFY(TICKS);
+  //cb_->new_notification(Listener::TICKS);
 }
 CGAL_KINETIC_END_INTERNAL_NAMESPACE
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_widget_2_core.cpp b/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_widget_2_core.cpp
index a933545a2c6..80a8e925936 100644
--- a/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_widget_2_core.cpp
+++ b/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_widget_2_core.cpp
@@ -29,14 +29,15 @@ void Qt_widget_2_core::redraw() {
   clear();
   //std::cout << "size of drawables = " << drawable_s.size() << std::endl;
   is_drawn_=false;
-  if (drawable_!= NULL) drawable_->new_notification(Listener::PICTURE_IS_CURRENT);
+  CGAL_KINETIC_NOTIFY(PICTURE_IS_CURRENT);
+  //if (drawable_!= NULL) drawable_->new_notification(Listener::PICTURE_IS_CURRENT);
   is_drawn_=true;
   unlock();
   //::CGAL::Qt_widget::redraw();
 }
 
 Qt_widget_2_core::Qt_widget_2_core(QMainWindow *parent): ::CGAL::Qt_widget(parent) {
-  drawable_=NULL;
+  //drawable_=NULL;
   is_drawn_=false;
 }
 CGAL_KINETIC_END_INTERNAL_NAMESPACE