Ellipse stuff broken out + new diagram