re-merging emc2 and HS.