final changes before merge