@@ -353,12 +353,13 @@ public void endDraw() {
       loadPixels();
     }
 
-    // Marking as modified, and then calling updatePixels() in
-    // the super class, which just sets the mx1, my1, mx2, my2
-    // coordinates of the modified area. This avoids doing the
-    // full copy of the pixels to the surface in this.updatePixels().
-    setModified();
-    super.updatePixels();
+//    // Marking as modified, and then calling updatePixels() in
+//    // the super class, which just sets the mx1, my1, mx2, my2
+//    // coordinates of the modified area. This avoids doing the
+//    // full copy of the pixels to the surface in this.updatePixels().
+//    setModified();
+//    super.updatePixels();
+    setModified();  // marks pixels as modified so that the pixels will be updated
   }
 
 
@@ -1253,7 +1254,7 @@ protected void imageImpl(PImage who,
     if ((tint && !cash.tinted) ||
         (tint && (cash.tintedColor != tintColor)) ||
         (!tint && cash.tinted)) {
-      // for tint change, mark all pixels as needing update
+      // For tint change, mark all pixels as needing update.
       who.updatePixels();
     }
 
@@ -1602,13 +1603,16 @@ protected float textWidthImpl(char buffer[], int start, int stop) {
     return super.textWidthImpl(buffer, start, stop);
   }
 
-  protected void beginTextScreenMode() {
-    loadPixels();
-  }
 
-  protected void endTextScreenMode() {
-    updatePixels();
-  }
+//  protected void beginTextScreenMode() {
+//    loadPixels();
+//  }
+
+
+//  protected void endTextScreenMode() {
+//    updatePixels();
+//  }
+
 
   //////////////////////////////////////////////////////////////
 
@@ -2308,19 +2312,19 @@ public void loadPixels() {
   }
 
 
-  /**
-   * Update the pixels[] buffer to the PGraphics image.
-   * <P>
-   * Unlike in PImage, where updatePixels() only requests that the
-   * update happens, in PGraphicsJava2D, this will happen immediately.
-   */
-  @Override
-  public void updatePixels() {
-    //updatePixels(0, 0, width, height);
-//    WritableRaster raster = ((BufferedImage) (useOffscreen && primarySurface ? offscreen : image)).getRaster();
-//    WritableRaster raster = image.getRaster();
-    getRaster().setDataElements(0, 0, width, height, pixels);
-  }
+//  /**
+//   * Update the pixels[] buffer to the PGraphics image.
+//   * <P>
+//   * Unlike in PImage, where updatePixels() only requests that the
+//   * update happens, in PGraphicsJava2D, this will happen immediately.
+//   */
+//  @Override
+//  public void updatePixels() {
+//    //updatePixels(0, 0, width, height);
+////    WritableRaster raster = ((BufferedImage) (useOffscreen && primarySurface ? offscreen : image)).getRaster();
+////    WritableRaster raster = image.getRaster();
+//    updatePixels(0, 0, width, height);
+//  }
 
 
   /**
@@ -2336,9 +2340,27 @@ public void updatePixels(int x, int y, int c, int d) {
       // Show a warning message, but continue anyway.
       showVariationWarning("updatePixels(x, y, w, h)");
     }
-    updatePixels();
+//    updatePixels();
+    if (pixels != null) {
+      getRaster().setDataElements(0, 0, width, height, pixels);
+    }
+    modified = true;
   }
 
+
+//  @Override
+//  protected void updatePixelsImpl(int x, int y, int w, int h) {
+//    super.updatePixelsImpl(x, y, w, h);
+//
+//    if ((x != 0) || (y != 0) || (w != width) || (h != height)) {
+//      // Show a warning message, but continue anyway.
+//      showVariationWarning("updatePixels(x, y, w, h)");
+//    }
+//    getRaster().setDataElements(0, 0, width, height, pixels);
+//  }
+
+
+
   //////////////////////////////////////////////////////////////
 
   // GET/SET
 
@@ -263,14 +263,31 @@ public void loadPixels() {
   }
 
 
+  @Override
+  public void updatePixels() {
+    if (hints[ENABLE_RETINA_PIXELS]) {
+      updatePixels(0, 0, retina.width, retina.height);
+    } else {
+      updatePixels(0, 0, width, height);
+    }
+  }
+
+
   /**
    * Update the pixels[] buffer to the PGraphics image.
    * <P>
    * Unlike in PImage, where updatePixels() only requests that the
    * update happens, in PGraphicsJava2D, this will happen immediately.
    */
   @Override
-  public void updatePixels() {
+  public void updatePixels(int ux, int uy, int uw, int uh) {
+    int wide = hints[ENABLE_RETINA_PIXELS] ? retina.width : width;
+    int high = hints[ENABLE_RETINA_PIXELS] ? retina.height : height;
+    if ((ux != 0) || (uy != 0) || (uw != wide) || (uh != high)) {
+      // Show a warning message, but continue anyway.
+      showVariationWarning("updatePixels(x, y, w, h)");
+    }
+    // If not using retina pixels, will need to first downsample
     if (!hints[ENABLE_RETINA_PIXELS]) {
       int offset = 0;
       int roffset = 0;
@@ -286,13 +303,10 @@ public void updatePixels() {
       }
     }
     getRaster().setDataElements(0, 0, retina.width, retina.height, retina.pixels);
+    modified = true;
   }
 
 
-  // No override necessary, just prints a warning and calls updatePixels()
-  //public void updatePixels(int x, int y, int c, int d);
-
-
   static int rgetset[] = new int[4];
 
   @Override
 
@@ -494,7 +494,8 @@ public void loadPixels() {  // ignore
 
 
   public void updatePixels() {  // ignore
-    updatePixelsImpl(0, 0, width, height);
+//    updatePixelsImpl(0, 0, width, height);
+    updatePixels(0, 0, width, height);
   }
 
 
@@ -530,11 +531,15 @@ public void updatePixels() {  // ignore
    * @param h height
    */
   public void updatePixels(int x, int y, int w, int h) {  // ignore
-    updatePixelsImpl(x, y, w, h);
-  }
-
-
-  protected void updatePixelsImpl(int x, int y, int w, int h) {
+//    updatePixelsImpl(x, y, w, h);
+//  }
+//
+//
+//  /**
+//   * Broken out as separate impl to signify that the w/y/w/h numbers have
+//   * already been tested and their bounds set properly.
+//   */
+//  protected void updatePixelsImpl(int x, int y, int w, int h) {
     int x2 = x + w;
     int y2 = y + h;
 
@@ -896,7 +901,8 @@ protected void getImpl(int sourceX, int sourceY,
   public void set(int x, int y, int c) {
     if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) return;
     pixels[y*width + x] = c;
-    updatePixelsImpl(x, y, 1, 1);  // slow?
+    //updatePixelsImpl(x, y, 1, 1);  // slow?
+    updatePixels(x, y, 1, 1);  // slow?
   }
 
 
@@ -955,7 +961,8 @@ protected void setImpl(PImage sourceImage,
       targetOffset += width;
     }
 
-    updatePixelsImpl(targetX, targetY, sourceWidth, sourceHeight);
+    //updatePixelsImpl(targetX, targetY, sourceWidth, sourceHeight);
+    updatePixels(targetX, targetY, sourceWidth, sourceHeight);
   }
 
 
 
@@ -18,6 +18,10 @@ o   JAI handles setting image size for png (check javax.imageio?)
 o   PNGEncodeParam png = PNGEncodeParam.getDefaultEncodeParam(bufImage);
 o   png.setPhysicalDimension(round(dpi*39.370079), round(dpi*39.370079), 1);
 o   JAI.create("filestore", bufImage, filename+".png", "PNG");
+X tint() with JAVA2D does not automatically refresh (with possible fix)
+X   https://github.com/processing/processing/issues/1730
+X change how updatePixels() is called in PGraphicsJava2D
+X   only call setModified(), not updatePixels() in endDraw()
 
 mouse wheel
 X add mouse wheel support to 2.0 event system
@@ -64,9 +68,6 @@ _ "deleted n framebuffer objects"
 _ draw() called again before finishing on OS X (retina issue)
 _   https://github.com/processing/processing/issues/1709
 
-_ tint() with JAVA2D does not automatically refresh (with possible fix)
-_   https://github.com/processing/processing/issues/1730
-
 _ Linux sometimes not responding correctly w/ the size() command
 _   https://github.com/processing/processing/issues/1672