Changes that Mike wanted, on v7e