Stitch specific changes
Merge pull request #1 from meiyust/hh_modify

Stitch specific changes