and final fixed to get vhtt fully integrated

Working version for vhtt