Updated to use whole VTC numbers.