Will Trump's nuke deal with Iran look like Obama's?

Donald Trump was scathing about Barack Obama's nuke deal with Iran signed in 2015. He said it was weak and failed to include any limitations on Tehran's sponsorship of terrorism in the Middle East. When he became president in 2017 he axed the deal, or at least he opted the US out of the deal which had also been signed by the other four permanent members of the UN Security Council - UK, France,China and Russia - plus Germany. But without the US on board, the deal fell apart. Now Trump is desperate to negotiate a new deal with Iran to avoid having to resort to military action to try and destroy the clandestine nuclear weapons programme facilities. But are the new talks also addressing Iran's state-sponsorship of Hamas, Hezbollah and the Houthis, or are they sticking exclusively to the nuke issue? If it's the latter, it's ironic that the Trump administration is trying to emulate the Obama deal which Trump hated. One of the great drawbacks of the Obama deal was that it only covered a limited period which meant Iran only had to bide its time before renewing its efforts to build a bomb, and in the meantime the sanctions on Iran would have been lifted immediately, effectively pouring billions of dollars into Tehran's coffers to continue nuclear research and support its proxy terrorist forces in the Middle East. If the Trump deal is going to be more effective. Ever, not just delayed for ten years.