In this article, Open Briefing analyst Kevjn Lim reviews the strengths of the existing Nuclear Non-proliferation Treaty and its executive arm, the International Atomic Energy Agency, as well as the flaws that have attended the pageant of past proliferation crises. Beyond this, in order to strengthen the NPT and the IAEA in the longer run, Lim argues for seven areas that the non-proliferation regime needs to take into account.