Updated ETYP throughout