Major Changes to HEAP, HERR Programs