EHN: some small modification