updates for features 2.0 and remove tvi