Ellipse now MUCH faster!