final changes before merge?