Sorting things out.

Sangine and AF changes.