More changes

Reg tested