adding v16 for tdf wrapper. deleted bad logic