wip/hs-Diff
