modified EHS to be almost done