Some changes.

Merge me.