d
Some changes