fix TAO changes
Updated HSZ changes