diff --git a/accessnow/machinetag.json b/accessnow/machinetag.json
index 28f34d6..f8d1f79 100644
--- a/accessnow/machinetag.json
+++ b/accessnow/machinetag.json
@@ -1,117 +1,117 @@
 {
-  "namespace": "accessnow",
-  "description": "Access Now",
-  "version": 1,
   "predicates": [
     {
-      "value": "anti-corruption-transparency",
+      "description": "The organization campaigns, or takes other actions against corruption and transparency.",
       "expanded": "Anti-Corruption and transparency",
-      "description": "The organization campaigns, or takes other actions against corruption and transparency."
+      "value": "anti-corruption-transparency"
     },
     {
-      "value": "anti-war-violence",
+      "description": "The organization campaigns, or takes other actions against war",
       "expanded": "Anti-War / Anti-Violence",
-      "description": "The organization campaigns, or takes other actions against war"
+      "value": "anti-war-violence"
     },
     {
-      "value": "culture",
+      "description": "The organization campaigns or acts to promote cultural events",
       "expanded": "Culture",
-      "description": "The organization campaigns or acts to promote cultural events Humanitarian Aid/Need Issues: relates to improving life for individuals in the developing world (right to shelter, right to education, right to food, right to water)"
+      "value": "culture"
     },
     {
-      "value": "economic-change",
+      "description": "Issues of economic policy, wealth distribution, etc.",
       "expanded": "Economic Change",
-      "description": "Issues of economic policy, wealth distribution, etc."
+      "value": "economic-change"
     },
     {
-      "value": "education",
+      "description": "The organization is concerned with some form of education",
       "expanded": "Education",
-      "description": "The organization is concerned with some form of education"
+      "value": "education"
     },
     {
-      "value": "election-monitoring",
+      "description": "The organization is an election monitor, or involved in election monitoring",
       "expanded": "Election Monitoring",
-      "description": "The organization is an election monitor, or involved in election monitoring"
+      "value": "election-monitoring"
     },
     {
-      "value": "environment",
+      "description": "The organization campaigns or acts to protect the environment",
       "expanded": "Environment",
-      "description": "The organization campaigns or acts to protect the environment"
+      "value": "environment"
     },
     {
-      "value": "freedom-expression",
+      "description": "The organization is concerned with freedom of speech issues",
       "expanded": "Freedom of Expression",
-      "description": "The organization is concerned with freedom of speech issues"
+      "value": "freedom-expression"
     },
     {
-      "value": "freedom-tool-development",
+      "description": "The organization develops tools for use in defending or extending digital rights",
       "expanded": "Freedom Tool Development",
-      "description": "The organization develops tools for use in defending or extending digital rights"
+      "value": "freedom-tool-development"
     },
     {
-      "value": "funding",
+      "description": " The organization is a funder of organizations or projects working with at risk users",
       "expanded": "Funding",
-      "description": " The organization is a funder of organizations or projects working with at risk users"
+      "value": "funding"
     },
     {
-      "value": "health",
+      "description": "The organization prevents epidemic illness or acts on curing them",
       "expanded": "Health Issues",
-      "description": "The organization prevents epidemic illness or acts on curing them"
+      "value": "health"
     },
     {
-      "value": "human-rights",
+      "description": "relating to the detection, recording, exposure, or challenging of abuses of human rights",
       "expanded": "Human Rights Issues",
-      "description": "relating to the detection, recording, exposure, or challenging of abuses of human rights"
+      "value": "human-rights"
     },
     {
-      "value": "internet-telecom",
+      "description": "Issues of digital rights in electronic communications",
       "expanded": "Internet and Telecoms",
-      "description": "Issues of digital rights in electronic communications"
+      "value": "internet-telecom"
     },
     {
-      "value": "lgbt-gender-sexuality",
+      "description": "Issues relating to the Lesbian, Gay, Bi, Transgender community",
       "expanded": "LGBT / Gender / Sexuality",
-      "description": "Issues relating to the Lesbian, Gay, Bi, Transgender community"
+      "value": "lgbt-gender-sexuality"
     },
     {
-      "value": "policy",
+      "description": "The organization is a policy think-tank, or policy advocate",
       "expanded": "Policy",
-      "description": "The organization is a policy think-tank, or policy advocate"
+      "value": "policy"
     },
     {
-      "value": "politics",
+      "description": "The organization takes a strong political view or is a political entity",
       "expanded": "Politics",
-      "description": "The organization takes a strong political view or is a political entity"
+      "value": "politics"
     },
     {
-      "value": "privacy",
+      "description": "Issues relating to the individual's reasonable right to privacy",
       "expanded": "Privacy",
-      "description": "Issues relating to the individual's reasonable right to privacy"
+      "value": "privacy"
     },
     {
-      "value": "rapid-response",
+      "description": "The organization provides rapid response type capability for civil society",
       "expanded": "Rapid Response",
-      "description": "The organization provides rapid response type capability for civil society"
+      "value": "rapid-response"
     },
     {
-      "value": "refugees",
+      "description": "Issues relating to displaced people",
       "expanded": "Refugees",
-      "description": "Issues relating to displaced people"
+      "value": "refugees"
     },
     {
-      "value": "security",
+      "description": "Issues relating to physical or information security",
       "expanded": "Security",
-      "description": "Issues relating to physical or information security"
+      "value": "security"
     },
     {
-      "value": "womens-right",
+      "description": "Issues pertaining to inequality between men and women, or issues of particular relevance to women",
       "expanded": "Women's Rights",
-      "description": "Issues pertaining to inequality between men and women, or issues of particular relevance to women"
+      "value": "womens-right"
     },
     {
-      "value": "youth-rights",
+      "description": "Issues of particular relevance to youth",
       "expanded": "Youth Rights",
-      "description": "Issues of particular relevance to youth"
+      "value": "youth-rights"
     }
-  ]
+  ],
+  "version": 2,
+  "description": "Access Now",
+  "namespace": "accessnow"
 }