Some changes before merge