Some changes 1