Now using Point2D.Double calls