WAHGMP edited (other small changes)