Improvements on _EnHT and _TySq