TNC-X upgrades - jhitesma