Updates to TopAFB code

Shared code untouched.