More changes before commit