Updates after merge