Updates before merge