Some changes to merge