Updates to TopAFB code