diff --git a/User.pde b/User.pde
index 10bde2c..13920a9 100644
--- a/User.pde
+++ b/User.pde
@@ -1,44 +1,66 @@
 /* --------------------------------------------------------------------------
  * SimpleOpenNI User Test
  * --------------------------------------------------------------------------
- * Processing Wrapper for the OpenNI/Kinect library
+ * Processing Wrapper for the OpenNI/Kinect 2 library
  * http://code.google.com/p/simple-openni
  * --------------------------------------------------------------------------
- * prog:  Max Rheiner / Interaction Design / zhdk / http://iad.zhdk.ch/
- * date:  02/16/2011 (m/d/y)
+ * prog:  Max Rheiner / Interaction Design / Zhdk / http://iad.zhdk.ch/
+ * date:  12/12/2012 (m/d/y)
  * ----------------------------------------------------------------------------
  */
 
-void setupUser(){
-  if(multiThread){
-  context = new SimpleOpenNI(this,SimpleOpenNI.RUN_MODE_MULTI_THREADED);
-  }else{
-  context = new SimpleOpenNI(this);
+color[]       userClr = new color[] { 
+  color(255, 0, 0), 
+  color(0, 255, 0), 
+  color(0, 0, 255), 
+  color(255, 255, 0), 
+  color(255, 0, 255), 
+  color(0, 255, 255)
+};
+PVector com = new PVector();                                   
+PVector com2d = new PVector();                                   
+
+void setupUser()
+{  
+  if (multiThread) {
+    context = new SimpleOpenNI(this, SimpleOpenNI.RUN_MODE_MULTI_THREADED);
+  }
+  else {
+    context = new SimpleOpenNI(this);
   }
   //context = new SimpleOpenNI(this);
-  context.setMirror(mirror);  //mirrors view but not joint names; that must be done separately
-   
+  context.setMirror(mirror); //mirrors view but not joint names; that must be done separately
+  
+  if (context.isInit() == false)
+  {
+    println("Can't init SimpleOpenNI, maybe the camera is not connected!"); 
+    exit();
+    return;
+  }
+
   // enable depthMap generation 
   context.enableDepth();
-  
+
   // enable skeleton generation for all joints
-  context.enableUser(SimpleOpenNI.SKEL_PROFILE_ALL);
- 
-  background(200,0,0);
+  context.enableUser();
+
+  background(200, 0, 0);
 
-  stroke(0,0,255);
+  stroke(0, 0, 255);
   strokeWeight(3);
   //smooth();
-  
-  //size(context.depthWidth(), context.depthHeight()); 
 }
 
-void drawUser(){
+void drawUser()
+{
   // update the cam
   context.update();
-  
+
   // draw depthImageMap
+  //image(context.depthImage(),0,0);
+  image(context.userImage(), 0, 0);
   
+  ///*---------- instead of context.userImage() ????
   if(modePreview){
     if(camDelayCounter<camDelayCounterMax){
       camDelayCounter++;
@@ -57,34 +79,57 @@ void drawUser(){
    }
     }
   }
-  //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  //-----------*/
+
   // draw the skeleton if it's available
-  if(context.isTrackingSkeleton(1)){
-    if(modePreview){
-    drawSkeleton(1);
-    if(sendOsc){
-      simpleOpenNiEvent(1);
-      oscSend(1);
-    }
-    }else if(modeRec){
-    simpleOpenNiEvent(1);
-    if(sendOsc) oscSend(1);
+  int[] userList = context.getUsers();
+  for (int i=0;i<userList.length;i++)
+  {
+    if (context.isTrackingSkeleton(userList[i]))
+    {
+      stroke(userClr[ (userList[i] - 1) % userClr.length ] );
+      if(modePreview){
+      drawSkeleton(userList[i]);
+      if(sendOsc){
+        simpleOpenNiEvent(userList[i]);
+        oscSend(userList[i]);
+      }
+      }else if(modeRec){
+        simpleOpenNiEvent(userList[i]);
+        if(sendOsc) oscSend(userList[i]);
+      }
+    }      
+
+    // draw the center of mass
+    if (context.getCoM(userList[i], com))
+    {
+      context.convertRealWorldToProjective(com, com2d);
+      stroke(100, 255, 0);
+      strokeWeight(1);
+      beginShape(LINES);
+      vertex(com2d.x, com2d.y - 5);
+      vertex(com2d.x, com2d.y + 5);
+
+      vertex(com2d.x - 5, com2d.y);
+      vertex(com2d.x + 5, com2d.y);
+      endShape();
+
+      fill(0, 255, 100);
+      text(Integer.toString(userList[i]), com2d.x, com2d.y);
     }
   }
-  //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 }
 
 // draw the skeleton with the selected joints
-void drawSkeleton(int userId){
+void drawSkeleton(int userId)
+{
   // to get the 3d joint data
   /*
   PVector jointPos = new PVector();
-  context.getJointPositionSkeleton(userId,SimpleOpenNI.SKEL_NECK,jointPos);
-  println(jointPos);
-  */
-  
-  stroke(0,0,255);
-  strokeWeight(3);
+   context.getJointPositionSkeleton(userId,SimpleOpenNI.SKEL_NECK,jointPos);
+   println(jointPos);
+   */
+
   context.drawLimb(userId, SimpleOpenNI.SKEL_HEAD, SimpleOpenNI.SKEL_NECK);
 
   context.drawLimb(userId, SimpleOpenNI.SKEL_NECK, SimpleOpenNI.SKEL_LEFT_SHOULDER);
@@ -104,56 +149,27 @@ void drawSkeleton(int userId){
 
   context.drawLimb(userId, SimpleOpenNI.SKEL_TORSO, SimpleOpenNI.SKEL_RIGHT_HIP);
   context.drawLimb(userId, SimpleOpenNI.SKEL_RIGHT_HIP, SimpleOpenNI.SKEL_RIGHT_KNEE);
-  context.drawLimb(userId, SimpleOpenNI.SKEL_RIGHT_KNEE, SimpleOpenNI.SKEL_RIGHT_FOOT);  
- 
+  context.drawLimb(userId, SimpleOpenNI.SKEL_RIGHT_KNEE, SimpleOpenNI.SKEL_RIGHT_FOOT);
 }
 
 // -----------------------------------------------------------------
 // SimpleOpenNI events
 
-void onNewUser(int userId){
+void onNewUser(SimpleOpenNI curContext, int userId)
+{
   println("onNewUser - userId: " + userId);
-  println("  start pose detection");
-  //~~~~~~~~~~~~~ added autocalibration ~~~~~~~~~~~~~~~~~
-  if(autoCalibrate){
-    context.requestCalibrationSkeleton(userId,true);
-  } else {    
-    context.startPoseDetection("Psi",userId);
-  }
-  //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~  
-}
-
-void onLostUser(int userId){
-  println("onLostUser - userId: " + userId);
-}
+  println("\tstart tracking skeleton");
 
-void onStartCalibration(int userId){
-  println("onStartCalibration - userId: " + userId);
+  curContext.startTrackingSkeleton(userId);
 }
 
-void onEndCalibration(int userId, boolean successful){
-  println("onEndCalibration - userId: " + userId + ", successful: " + successful);
-  
-  if (successful){ 
-    println("  User calibrated !!!");
-    context.startTrackingSkeleton(userId); 
-  } else { 
-    println("  Failed to calibrate user !!!");
-    println("  Start pose detection");
-    context.startPoseDetection("Psi",userId);
-  }
-}
-
-void onStartPose(String pose,int userId){
-  println("onStartPose - userId: " + userId + ", pose: " + pose);
-  println(" stop pose detection");
-  
-  context.stopPoseDetection(userId); 
-  context.requestCalibrationSkeleton(userId, true);
- 
+void onLostUser(SimpleOpenNI curContext, int userId)
+{
+  println("onLostUser - userId: " + userId);
 }
 
-void onEndPose(String pose,int userId){
-  println("onEndPose - userId: " + userId + ", pose: " + pose);
+void onVisibleUser(SimpleOpenNI curContext, int userId)
+{
+  //println("onVisibleUser - userId: " + userId);
 }
 
diff --git a/code/SimpleOpenNI.jar b/code/probably_unnessecary/SimpleOpenNI.jar
similarity index 100%
rename from code/SimpleOpenNI.jar
rename to code/probably_unnessecary/SimpleOpenNI.jar
diff --git a/code/SimpleOpenNI32.dll b/code/probably_unnessecary/SimpleOpenNI32.dll
similarity index 100%
rename from code/SimpleOpenNI32.dll
rename to code/probably_unnessecary/SimpleOpenNI32.dll
diff --git a/code/SimpleOpenNI64.dll b/code/probably_unnessecary/SimpleOpenNI64.dll
similarity index 100%
rename from code/SimpleOpenNI64.dll
rename to code/probably_unnessecary/SimpleOpenNI64.dll
diff --git a/code/export.txt b/code/probably_unnessecary/export.txt
similarity index 100%
rename from code/export.txt
rename to code/probably_unnessecary/export.txt
diff --git a/code/libSimpleOpenNI.jnilib b/code/probably_unnessecary/libSimpleOpenNI.jnilib
old mode 100755
new mode 100644
similarity index 100%
rename from code/libSimpleOpenNI.jnilib
rename to code/probably_unnessecary/libSimpleOpenNI.jnilib
diff --git a/code/libSimpleOpenNI.so b/code/probably_unnessecary/libSimpleOpenNI.so
old mode 100755
new mode 100644
similarity index 100%
rename from code/libSimpleOpenNI.so
rename to code/probably_unnessecary/libSimpleOpenNI.so
diff --git a/code/libSimpleOpenNI32.so b/code/probably_unnessecary/libSimpleOpenNI32.so
old mode 100755
new mode 100644
similarity index 100%
rename from code/libSimpleOpenNI32.so
rename to code/probably_unnessecary/libSimpleOpenNI32.so
diff --git a/code/libSimpleOpenNI64.so b/code/probably_unnessecary/libSimpleOpenNI64.so
old mode 100755
new mode 100644
similarity index 100%
rename from code/libSimpleOpenNI64.so
rename to code/probably_unnessecary/libSimpleOpenNI64.so
diff --git a/settings.txt b/settings.txt
index 7b1e3f5..3b2ff4f 100644
--- a/settings.txt
+++ b/settings.txt
@@ -17,7 +17,7 @@ Export AE Template Script (.jsx)
 false
 
 Export Maya Script (.py)
-true
+false
 
 Export Pointcloud (.obj)
 false
@@ -47,10 +47,10 @@ Enable Multithreading
 true
 
 Load SimpleOpenNI at Startup
-false
+true
 
 SimpleOpenNI Autocalibration (no "cactus pose")
-false
+true
 
 Send OSC Active
 true