Some changes #1