added support for ellipses