diff --git a/js/gmap_shapes.js b/js/gmap_shapes.js
index 81fc73f..4229b2c 100644
--- a/js/gmap_shapes.js
+++ b/js/gmap_shapes.js
@@ -3,53 +3,54 @@
  * @file
  * GMap Shapes
  * GMap API version / Base case
+ *
  */
 
-/*global $, Drupal, GEvent, GLatLng, GPolygon, GPolyline */
+/*global $, Drupal, google.maps, !google.maps.geometry! */
 
 Drupal.gmap.addHandler('gmap', function (elem) {
   var obj = this;
-/*
-  obj.bind('init',function() {
-    if (obj.vars.behavior.autozoom) {
-      obj.bounds = new GLatLngBounds(new GLatLng(obj.vars.latitude,obj.vars.longitude),new GLatLng(obj.vars.latitude,obj.vars.longitude));
-    }
-  });
-*/
+
   obj.bind('prepareshape', function (shape) {
-    var pa, cargs, style;
-    //var m = new GMarker(new GLatLng(marker.latitude,marker.longitude),marker.opts);
-    pa = []; // point array (array of GLatLng-objects)
-    var fillstyle = true;
-    if (shape.type === 'circle') {
-      pa = obj.poly.calcPolyPoints(new GLatLng(shape.center[0], shape.center[1]), shape.radius * 1000, shape.numpoints);
-    }
-    else if (shape.type === 'rpolygon') {
-      shape.center = new GLatLng(shape.center[0], shape.center[1]);
-      shape.point2 = new GLatLng(shape.point2[0], shape.point2[1]);
-      var radius = shape.center.distanceFrom(shape.point2);
+    var pa, cargs, style, nofillstyle;
+    cargs = {};
+    pa = []; // point array (array of LatLng-objects)
+
+    if (shape.type === 'circle' ) {
+      if ( typeof shape.center === 'array') { shape.center = new google.maps.LatLng(shape.center[0], shape.center[1]); } // otherwise it should be a LatLng already
+      if ( shape.point2 ) {
+        if ( typeof shape.point2 === 'array') { shape.point2 = new google.maps.LatLng(shape.point2[0], shape.point2[1]); } // otherwise it should be a LatLng already
+        shape.radius = google.maps.geometry.spherical.computeDistanceBetween( shape.center, shape.point2 );
+      } // if you didn't pass a shape.point2, then you should have passed a shape.radius in meters
+    }
+    if (shape.type === 'rpolygon') { /* this is deprecated as we have circle now.  It is left for backwards compatibility */
+      if ( typeof shape.center === 'array') { shape.center = new google.maps.LatLng(shape.center[0], shape.center[1]); } // otherwise it should be a LatLng already
+      if ( typeof shape.point2 === 'array') { shape.point2 = new google.maps.LatLng(shape.point2[0], shape.point2[1]); } // otherwise it should be a LatLng already
+      shape.radius = google.maps.geometry.spherical.computeDistanceBetween( shape.center, shape.point2 );
+      if ( !shape.numpoints ) { shape.numpoints = 20; }
       pa = obj.poly.calcPolyPoints(shape.center, radius, shape.numpoints);
     }
-    else if (shape.type === 'polygon') {
+    else if (shape.type==='polygon') {
       $.each(shape.points, function (i, n) {
-        pa.push(new GLatLng(n[0], n[1]));
+        if ( typeof n === 'array') { n = new google.maps.LatLng(n[0], n[1]); } // otherwise it should be a LatLng already
+        pa.push( n );
       });
     }
     else if (shape.type === 'line') {
       $.each(shape.points, function (i, n) {
-        pa.push(new GLatLng(n[0], n[1]));
+        if ( typeof n === 'array') { n = new google.maps.LatLng(n[0], n[1]); } // otherwise it should be a LatLng already
+        pa.push( n );
       });
-      fillstyle = false;
+      nofillstyle = true;
     }
-    cargs = [pa];
-
-    // Style normalization
-    if (fillstyle) {
-      style = obj.vars.styles.poly_default.slice();
+    else if (shape.type==='encoded_polygon') {
+      pa = google.maps.geometry.encoding.decodePath(shape.path);
     }
-    else {
-      style = obj.vars.styles.line_default.slice();
+    else if (shape.type === 'encoded_line') {
+      pa = google.maps.geometry.encoding.decodePath(shape.path);
+      nofillstyle = true;
     }
+
     if (shape.style) {
       if (typeof shape.style === 'string') {
         if (obj.vars.styles[shape.style]) {
@@ -59,60 +60,65 @@ Drupal.gmap.addHandler('gmap', function (elem) {
       else {
         style = shape.style.slice();
       }
-    }
-    style[0] = '#' + style[0];
-    style[1] = Number(style[1]);
-    style[2] = style[2] / 100;
-    if (fillstyle) {
-      style[3] = '#' + style[3];
-      style[4] = style[4] / 100;
-    }
-    
-    if (shape.type == 'encoded_line') {
-      shape.color = style[0];
-      shape.weight = style[1];
-      shape.opacity = style[2];
-    }
-    else if (shape.type == 'encoded_polygon') {
-      $.each(shape.polylines, function(i, polyline) {
-        polyline.color = style[0];
-        polyline.weight = style[1];
-        polyline.opacity = style[2];
-      });
-      shape.fill = true;
-      shape.color = style[3];
-      shape.opacity = style[4];
-      shape.outline = true;
+      style[0] = '#' + style[0];
+      style[1] = Number(style[1]);
+      style[2] = style[2] / 100;
+      if (!fillstyle) {
+        style[3] = '#' + style[3];
+        style[4] = style[4] / 100;
+      }
+
+      if (shape.type == 'encoded_line') {
+        shape.color = style[0];
+        shape.weight = style[1];
+        shape.opacity = style[2];
+      }
+      else if (shape.type == 'encoded_polygon') {
+        if ( shape.polylines ) {
+          $.each(shape.polylines, function(i, polyline) {
+            polyline.color = style[0];
+            polyline.weight = style[1];
+            polyline.opacity = style[2];
+          });
+        }
+        shape.fill = true;
+        shape.color = style[3];
+        shape.opacity = style[4];
+        shape.outline = true;
+      }
     }
 
-    $.each(style, function (i, n) {
-      cargs.push(n);
-    });
     if (shape.opts) {
-      cargs.push(shape.opts);
+      $.extend(cargs, shape.opts);
     }
-    var Pg = function (args) {
-      GPolygon.apply(this, args);
-    };
-    Pg.prototype = new GPolygon();
-    var Pl = function (args) {
-      GPolyline.apply(this, args);
-    };
-    Pl.prototype = new GPolyline();
+
     switch (shape.type) {
       case 'circle':
-      case 'polygon':
+        cargs = {center:shape.center, radius: shape.radius, strokeColor: shape.color }; // required arges
+        if ( shape.outline ) { cargs.strokeColor = shape.color; } // outline color
+        if ( shape.weight ) { cargs.strokeWeight = shape.weight; } // boundary line weight
+        if ( shape.fill ) { cargs.fillColor = shape.color; } // shape fill color
+        if ( shape.opacity ) { cargs.strokeOpacity = shape.color; cargs.fillOpacity = shape.color; } // shape opacity
+        shape.shape = new google.maps.Circle(cargs);
+        break;
       case 'rpolygon':
-        shape.shape = new Pg(cargs);
+      case 'encoded_polygon':
+      case 'polygon':
+        cargs = { path: pa }; // required args
+        if ( shape.outline ) { cargs.strokeColor = shape.color; }
+        if ( shape.weight ) { cargs.strokeWeight = shape.weight; }
+        if ( shape.fill ) { cargs.fillColor = shape.color; }
+        if ( shape.opacity ) { cargs.strokeOpacity = shape.color; cargs.fillOpacity = shape.color; }
+        shape.shape = new google.maps.Polygon(cargs);
         break;
       case 'line':
-        shape.shape = new Pl(cargs);
-        break;
       case 'encoded_line':
-        shape.shape = GPolyline.fromEncoded(shape);        
-        break;
-      case 'encoded_polygon':
-        shape.shape = GPolygon.fromEncoded(shape);
+        cargs = { path: pa }; // required args
+        if ( shape.color ) { cargs.strokeColor = shape.color; }
+        if ( shape.weight ) { cargs.strokeWeight = shape.weight; }
+        if ( shape.fill ) { cargs.fillColor = shape.color; }
+        if ( shape.opacity ) { cargs.strokeOpacity = shape.color; cargs.fillOpacity = shape.color; }
+        shape.shape = new google.maps.Polyline(cargs);
         break;
     }
   });
@@ -122,17 +128,40 @@ Drupal.gmap.addHandler('gmap', function (elem) {
       obj.vars.shapes = [];
     }
     obj.vars.shapes.push(shape);
-    obj.map.addOverlay(shape.shape);
+    shape.shape.setMap(obj.map);
 
     if (obj.vars.behavior.clickableshapes) {
-      GEvent.addListener(shape.shape, 'click', function () {
+      google.maps.event.addListener(shape.shape, 'click', function () {
         obj.change('clickshape', -1, shape);
       });
     }
+    if (obj.vars.behavior.shapesactions) {
+      google.maps.event.addListener(shape.shape, 'dblclick', function () {
+        obj.change('dblclickshape', -1, shape);
+      });
+      google.maps.event.addListener(shape.shape, 'mousedown', function () {
+        obj.change('mousedownshape', -1, shape);
+      });
+      google.maps.event.addListener(shape.shape, 'mouseout', function () {
+        obj.change('mouseoutshape', -1, shape);
+      });
+      google.maps.event.addListener(shape.shape, 'mouseover', function () {
+        obj.change('mouseovershape', -1, shape);
+      });
+      google.maps.event.addListener(shape.shape, 'mouseup', function () {
+        obj.change('mouseupshape', -1, shape);
+      });
+      google.maps.event.addListener(shape.shape, 'mousemove', function () {
+        obj.change('mousemoveshape', -1, shape);
+      });
+      google.maps.event.addListener(shape.shape, 'rightclick', function () {
+        obj.change('rightclickshape', -1, shape);
+      });
+    }
   });
 
   obj.bind('delshape', function (shape) {
-    obj.map.removeOverlay(shape.shape);
+    shape.shape.setMap( null );
   });
 
   obj.bind('clearshapes', function () {