Refactor and go through all the EHs