and final fixed to get vhtt fully integrated