They both were.
.
Were all of the weapons returned? It makes me ill that Iran still has 5 American prisoners, but that’s another story. Why? Well that is the 160 billion dollar question!