Add 'Origin' and improve ClosedNGon