Changed units, iterator, poly, types. Added range.