More changes before merge