updates before merge