More TOAFV updates