More changes

blah2342