Trump's Iran War and So-called Deal? Obama's was better, but Trump ripped it up and here we are

The JCPOA was effective, verifiable, but never touted as a perfect document. Trump ripped it up allowing Iran to begin enrichment anew. Will any Trump deal come close to the original plan?