[FIX] Revisions from defense.