modifications to hs for yummy version