Some changes

Trying again.