12 files changed, 180 insertions, 65 deletions
diff --git a/site/content/pages/about/assets/LICENSE.md b/site/content/pages/about/assets/LICENSE.md
new file mode 100644
index 00000000..90f1fb01
--- /dev/null
+++ b/site/content/pages/about/assets/LICENSE.md
@@ -0,0 +1,34 @@
+ATTRIBUTION PROTOCOL
+
+If you use the MegaPixels data or any data derived from it, please cite the original work as follows:
+
+```
+@online{megapixels,
+  author = {Harvey, Adam. LaPlace, Jules.},
+  title = {MegaPixels: Origins, Ethics, and Privacy Implications of Publicly Available Face Recognition Image Datasets},
+  year = 2019,
+  url = {https://megapixels.cc/},
+  urldate = {2019-04-20}
+}
+```
+
+and include this license and attribution protocol within any derivative work.
+
+If you publish data derived from MegaPixels, the original dataset creators should first be notified.
+
+The MegaPixels dataset is made available under the Open Data Commons Attribution License (https://opendatacommons.org/licenses/by/1.0/) and for academic use only.
+
+READABLE SUMMARY OF Open Data Commons Attribution License 
+
+You are free:
+
+    To Share: To copy, distribute and use the dataset
+    To Create: To produce works from the dataset
+    To Adapt: To modify, transform and build upon the database
+
+As long as you:
+
+    Attribute: You must attribute any public use of the database, or works produced from the database, in the manner specified in the license. For any use or redistribution of the database, or works produced from it, you must make clear to others the license of the database and keep intact any notices on the original database.
+
+
+
diff --git a/site/content/pages/about/assets/adam-harvey-3d.jpg b/site/content/pages/about/assets/adam-harvey-3d.jpg
deleted file mode 100644
index 2d7cbd80..00000000
--- a/site/content/pages/about/assets/adam-harvey-3d.jpg
+++ /dev/null
diff --git a/site/content/pages/about/assets/adam-harvey-3d.png b/site/content/pages/about/assets/adam-harvey-3d.png
deleted file mode 100644
index 3616e851..00000000
--- a/site/content/pages/about/assets/adam-harvey-3d.png
+++ /dev/null
diff --git a/site/content/pages/about/assets/adam-harvey.jpg b/site/content/pages/about/assets/adam-harvey.jpg
deleted file mode 100644
index 38a484d1..00000000
--- a/site/content/pages/about/assets/adam-harvey.jpg
+++ /dev/null
diff --git a/site/content/pages/about/assets/jules-laplace-3d.jpg b/site/content/pages/about/assets/jules-laplace-3d.jpg
deleted file mode 100644
index d51e0933..00000000
--- a/site/content/pages/about/assets/jules-laplace-3d.jpg
+++ /dev/null
diff --git a/site/content/pages/about/assets/jules-laplace.jpg b/site/content/pages/about/assets/jules-laplace.jpg
deleted file mode 100644
index 18fc1170..00000000
--- a/site/content/pages/about/assets/jules-laplace.jpg
+++ /dev/null
diff --git a/site/content/pages/about/assets/mozilla.png b/site/content/pages/about/assets/mozilla.png
deleted file mode 100644
index 0fd4f115..00000000
--- a/site/content/pages/about/assets/mozilla.png
+++ /dev/null
diff --git a/site/content/pages/about/attribution.md b/site/content/pages/about/attribution.md
new file mode 100644
index 00000000..cf537ad4
--- /dev/null
+++ b/site/content/pages/about/attribution.md
@@ -0,0 +1,58 @@
+------------
+
+status: published
+title: Privacy Policy
+desc: MegaPixels Privacy Policy
+slug: privacy-policy
+cssclass: about
+published: 2018-12-04
+updated: 2018-12-04
+authors: Adam Harvey
+ 
+------------
+
+# Legal
+
+<section class="about-menu">
+<ul>
+<li><a href="/about/">About</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a class="current" href="/about/attribution/">Attribution</a></li>
+<li><a href="/about/legal/">Legal / Privacy</a></li>
+</ul>
+</section>
+
+ATTRIBUTION PROTOCOL
+
+If you use the MegaPixels data or any data derived from it, please cite the original work as follows:
+
+<pre>
+@online{megapixels,
+  author = {Harvey, Adam. LaPlace, Jules.},
+  title = {MegaPixels: Origins, Ethics, and Privacy Implications of Publicly Available Face Recognition Image Datasets},
+  year = 2019,
+  url = {https://megapixels.cc/},
+  urldate = {2019-04-20}
+}
+</pre>
+
+and include this license and attribution protocol within any derivative work.
+
+If you publish data derived from MegaPixels, the original dataset creators should first be notified.
+
+The MegaPixels dataset is made available under the Open Data Commons Attribution License (https://opendatacommons.org/licenses/by/1.0/) and for academic use only.
+
+READABLE SUMMARY OF Open Data Commons Attribution License 
+
+You are free:
+
+> To Share: To copy, distribute and use the dataset
+To Create: To produce works from the dataset
+To Adapt: To modify, transform and build upon the database
+
+As long as you:
+
+> Attribute: You must attribute any public use of the database, or works produced from the database, in the manner specified in the license. For any use or redistribution of the database, or works produced from it, you must make clear to others the license of the database and keep intact any notices on the original database.
+
+
+
diff --git a/site/content/pages/about/faq.md b/site/content/pages/about/faq.md
deleted file mode 100644
index 8b780262..00000000
--- a/site/content/pages/about/faq.md
+++ /dev/null
@@ -1,26 +0,0 @@
-------------
-
-status: published
-title: MegaPixels Press and News
-desc: MegaPixels Press and News
-slug: faqs
-cssclass: about
-published: 2018-12-04
-updated: 2018-12-04
-authors: Adam Harvey
- 
-------------
- 
-# FAQs
-
-<section class="about-menu">
-<ul>
-<li><a href="/about/">About</a></li>
-<li><a class="current" href="/about/faq/">FAQs</a></li>
-<li><a href="/about/press/">Press</a></li>
-<li><a href="/about/terms/">Terms</a></li>
-<li><a href="/about/privacy/">Privacy</a></li>
-</ul>
-</section>
-
-[ page under development ]
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index 5fc147c9..f68008cc 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -16,17 +16,18 @@ authors: Adam Harvey
 <section class="about-menu">
 <ul>
 <li><a class="current" href="/about/">About</a></li>
-<li><a href="/about/faq/">FAQs</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a href="/about/terms/">Terms</a></li>
-<li><a href="/about/privacy/">Privacy</a></li>
+<li><a href="/about/attribution/">Attribution</a></li>
+<li><a href="/about/legal/">Legal / Privacy</a></li>
 </ul>
 </section>
 
-MegaPixels is an independent art and research project by Adam Harvey and Jules LaPlace investigating the ethics and individual privacy implications of publicly available face recognition datasets, and their role in industry and governmental expansion into biometric surveillance technologies.
+MegaPixels is an independent art and research project by Adam Harvey and Jules LaPlace that investigates the ethics, origins, and individual privacy implications of face recognition image datasets and their role in the expansion of biometric surveillance technologies.
+
 
 The MegaPixels site is made possible with support from <a href="http://mozilla.org">Mozilla</a>
 
+
 <div class="flex-container team-photos-container">
     <div class="team-member">
         <h3>Adam Harvey</h3>
@@ -42,30 +43,37 @@ The MegaPixels site is made possible with support from <a href="http://mozilla.o
     </div>
 </div>
 
-MegaPixels.cc is an independent research project about publicly available face recognition datasets. This website is based, in part, on earlier installations and research projects about facial recognition datasets in 2016-2018, which focused particularly on the MegaFace dataset. Since then it has evolved into a large-scale survey of publicly-available face and person analysis datasets, covering their usage, geographies, and ethics.
 
-An academic report and presentation on the findings is forthcoming. This site is published to make the research more accessible to a wider audience and to include visualizations and interactive features not possible in PDF publications. Continued research on MegaPixels is supported by a 1 year Researcher-in-Residence grant from Karlsruhe HfG.
+The MegaPixels website is based on an [earlier installation from 2017](https://ahprojects.com/megapixels-glassroom/) and ongoing research and lectures ([TedX](https://www.youtube.com/watch?v=bfhcco9gS30), [CPDP](https://www.cpdpconferences.org/events/megapixels-is-in-publicly-available-facial-recognition-datasets)) about facial recognition datasets. Over the last several years this project has evolved into a large-scale interrogation of hundreds of publicly-available face and person analysis datasets. 
+
+MegaPixels aims to provide a critical perspective on machine learning image datsets, one that might otherwise escape academia and the industry funded artificial intelligence think tanks that are often supported by the same technology companies who have created many of the datasets presented on this site.
+
+MegaPixels is an independent project, designed as a public resource for educators, students, journalists, and researchers. Each dataset presented on this site undergoes a thorough review of its images, intent, and funding sources. Though the goals are similar to publishing a public academic paper, MegaPixels is a website-first reserch project aligns closley with the goals of pre-print academic publications. As such we welcome feedback and ways to improve this site and the clarity of the research.
+
+Because this project surfaces many funding issues with datasets (from datasets funded by the C.I.A. to the National Unviversity of Defense and Technology in China), it is important that we are transparent about own funding. The original MegaPixels installation in 2017 was built as a commission for and with support from Tactical Technology Collective and Mozilla. The bulk of the research and web-development during 2018 - 2018 was supported by a grant from Mozilla. Continued development in 2019 is partially supported by a 1-year Reseacher-in-Residence grant from Karlsruhe HfG, lecture and workshop fees, and from commissions and sales from the Privacy Gift Shop.
+
+Please get in touch if you are interested in supporting this project.
 
-When possible, and once thoroughly verified, data generated for MegaPixels will be made available for download on [github.com/adamhrv/megapixels](https://github.com/adamhrv/megapixels)
 
 === columns 3
 
-#### Team
+##### Team
 
-- Adam Harvey: Concept, research, design, computer vision
-- Jules LaPlace: Information and systems architecture, data retrieval, web applications
+- Adam Harvey: Concept, research and analysis, design, computer vision
+- Jules LaPlace: Information and systems architecture, data management, web applications
+You are free:
 
 ===========
 
-#### Contributing Researchers
+##### Contributing Researchers
 
-- Berit Gilma: Dataset statistics and discovery
-- Beth (aka Ms. Celeb): Dataset usage verification and research
-- Mathana Stender: Commercial usage verification and research on LFW
+- Berit Gilma
+- Beth (aka Ms. Celeb)
+- Mathana Stender
 
 ===========
 
-#### Code and Libraries
+##### Code and Libraries
 
 - [Semantic Scholar](https://semanticscholar.org) for citation aggregation
 - Leaflet.js for maps
@@ -75,4 +83,18 @@ When possible, and once thoroughly verified, data generated for MegaPixels will
 
 === end columns
 
-Please direct questions, comments, or feedback to [mastodon.social/@adamhrv](https://mastodon.social/@adamhrv)
-\ No newline at end of file
+Please direct questions, comments, or feedback to [mastodon.social/@adamhrv](https://mastodon.social/@adamhrv)
+
+##### Attribution
+
+If you use MegaPixels or any data derived from it for your work, please cite our original work as follows:
+
+<pre>
+@online{megapixels,
+  author = {Harvey, Adam. LaPlace, Jules.},
+  title = {MegaPixels: Origins, Ethics, and Privacy Implications of Publicly Available Face Recognition Image Datasets},
+  year = 2019,
+  url = {https://megapixels.cc/},
+  urldate = {2019-04-20}
+}
+</pre>
diff --git a/site/content/pages/about/legal.md b/site/content/pages/about/legal.md
index 089f32d7..85cf5c48 100644
--- a/site/content/pages/about/legal.md
+++ b/site/content/pages/about/legal.md
@@ -16,44 +16,70 @@ authors: Adam Harvey
 <section class="about-menu">
 <ul>
 <li><a href="/about/">About</a></li>
-<li><a href="/about/faq/">FAQs</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a href="/about/terms/">Terms</a></li>
-<li><a class="current" href="/about/privacy/">Privacy</a></li>
+<li><a href="/about/attribution/">Attribution</a></li>
+<li><a class="current" href="/about/legal/">Legal / Privacy</a></li>
 </ul>
 </section>
 
 MegaPixels.cc Terms and Privacy
 
-MegaPixels is an independent art and research project about the origins and ethics of publicly available face analysis image datasets. By accessing MegaPixels (the *Service* or *Services*) you agree to the terms and conditions set forth below.
-
-### Changes
-
-We reserve the right, at our sole discretion, to modify or replace these Terms at any time. If a revision is material we will try to provide at least 30 days notice prior to any new terms taking effect. What constitutes a material change will be determined at our sole discretion.
-
-By continuing to access or use our Service after those revisions become effective, you agree to be bound by the revised terms. If you do not agree to the new terms, please stop using the Service.
+MegaPixels is an independent and academic art and research project about the origins and ethics of publicly available face analysis image datasets. By accessing MegaPixels (the *Service* or *Services*) you agree to the terms and conditions set forth below.
 
 
 ## Privacy
 
-The MegaPixels site has been designed to minimize the amount of network requests to 3rd party services and therefore prioritize the privacy of the viewer by only loading local dependencies. Additionaly, this site does not use any anaytics programs to monitor site viewers. In fact, the only data collected are the necessary server logs that used only for preventing misuse, which are deleteted at regular short-term intervals.
+The MegaPixels site has been designed to minimize the amount of network requests to 3rd party services and therefore prioritize the privacy of the viewer. This site does not use any local or external analytics programs to monitor site viewers. In fact, the only data collected are the necessary server logs used only for preventing misuse, which are deleted at short-term intervals.
 
 ## 3rd Party Services
 
-In order to provide certain features of the site, some 3rd party services are needed. Currently, the MegaPixels.cc site uses two 3rd party services: (1) Leaflet.js for the interactive map and (2 Digital Ocean Spaces as a condent delivery network. Both services encrypt your requests to their server using HTTPS and neither service requires storing any cookies or authentication. However, both services will store files in your web browser's local cache (local storage) to improve loading performance. None of these local storage files are using for analytics, cookie-like technologies, tracking, or any similar purpose.
+In order to provide certain features of the site, some 3rd party services are needed. Currently, the MegaPixels.cc site uses two 3rd party services: (1) Leaflet.js for the interactive map and (2) Digital Ocean Spaces as a content delivery network. Both services encrypt your requests to their server using HTTPS and neither service requires storing any cookies or authentication. However, both services will store files in your web browser's local cache (local storage) to improve loading performance. None of these local storage files are using for analytics, tracking, or any similar purpose.
 
 ### Links To Other Web Sites
 
-The MegaPixels.cc contains many links to 3rd party websites, especically in the list of citations that are provided for each dataset. This website has no control over and assumes no responsibility for, the content, privacy policies, or practices of any third party web sites or services. You further acknowledge and agree that megapixels.cc shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such web sites or services.
+The MegaPixels.cc contains many links to 3rd party websites, especially in the list of citations that are provided for each dataset. This website has no control over and assumes no responsibility for, the content, privacy policies, or practices of any third party web sites or services. You  acknowledge and agree that megapixels.cc shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such web sites or services.
 
 We advise you to read the terms and conditions and privacy policies of any third-party web sites or services that you visit.
 
+### Information We Collect
+
+When you access the Service, we record your visit to the site in a server log file for the purposes of maintaining site security and preventing misuse. This includes your IP address and the header information sent by your web browser which includes the User Agent, referrer, and the requested page on our site.
+
+### Information We Share
+
+We do not share or make public any information about individual site visitors, unless where required by law to the extent that server logs are only retained for a limited duration.
+
+
+### Information We Provide
+
+We provide information for educational, journalistic, and research purposes. The published information on MegaPixels is made available under the Open Data Commons Attribution License (https://opendatacommons.org/licenses/by/1.0/) and for academic use only.
 
-### The Information We Provide
+You are free:
 
-While every intention is made to verify and publish only verifiablenformation, at times amendments to accuracy may be required. In no event will the operators of this site be liable for your use or misuse of the information provided.
+> To Share: To copy, distribute and use the dataset
+To Create: To produce works from the dataset
+To Adapt: To modify, transform and build upon the database
 
-We may terminate or suspend access to our Service immediately, without prior notice or liability, for any reason whatsoever, including without limitation if you breach the Terms.
+As long as you:
+
+
+> Attribute: You must attribute any public use of the database, or works produced from the database, in the manner specified in the license. For any use or redistribution of the database, or works produced from it, you must make clear to others the license of the database and keep intact any notices on the original database.
+
+If you use the MegaPixels data or any data derived from it, please cite the original work as follows:
+
+<pre>
+@online{megapixels,
+  author = {Harvey, Adam. LaPlace, Jules.},
+  title = {MegaPixels: Origins, Ethics, and Privacy Implications of Publicly Available Face Recognition Image Datasets},
+  year = 2019,
+  url = {https://megapixels.cc/},
+  urldate = {2019-04-20}
+}
+</pre>
+
+While every intention is made to publish only verifiable information, at times information may be edited, removed, or appended for clarity or correction. In no event will the operators of this site be liable for your use or misuse of the information provided.
+
+We may terminate or suspend access to our Service immediately without prior notice or liability, for any reason whatsoever, including without limitation if you breach the Terms.
 
 All provisions of the Terms which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
 
@@ -69,7 +95,7 @@ Without prior written consent, you shall not:
 
 (iii) use services, software or any manual or automatic device, tool, or process designed to circumvent any restriction, condition, or technological measure that controls access to the Services in any way, including overriding any security feature or bypassing or circumventing any access controls or use limits of the Services;
 
-(iv) cache or archive the Content (except for a public search engine’s use of spiders for creating search indices);
+(iv) cache or archive the Content (except for a public search engine’s use of spiders for creating search indices) with prior written consent;
 
 (v) take action that imposes an unreasonable or disproportionately large load on our network or infrastructure; and
 
@@ -85,4 +111,8 @@ Our failure to enforce any right or provision of these Terms will not be conside
 
 ### Indemnity
 
-You hereby indemnify, defend and hold harmless MegaPixels (and its creators) and all officers, directors, owners, agents, information providers, affiliates, licensors and licensees (collectively, the "Indemnified Parties") from and against any and all liability and costs, including, without limitation, reasonable attorneys' fees, incurred by the Indemnified Parties in connection with any claim arising out of any breach by you or any user of your account of these Terms of Service or the foregoing representations, warranties and covenants. You shall cooperate as fully as reasonably required in the defense of any such claim. We reserves the right, at its own expense, to assume the exclusive defense and control of any matter subject to indemnification by you.
-\ No newline at end of file
+You hereby indemnify, defend and hold harmless MegaPixels (and its creators) and all officers, directors, owners, agents, information providers, affiliates, licensors and licensees (collectively, the "Indemnified Parties") from and against any and all liability and costs, including, without limitation, reasonable attorneys' fees, incurred by the Indemnified Parties in connection with any claim arising out of any breach by you or any user of your account of these Terms of Service or the foregoing representations, warranties and covenants. You shall cooperate as fully as reasonably required in the defense of any such claim. We reserves the right, at its own expense, to assume the exclusive defense and control of any matter subject to indemnification by you.
+
+### Changes
+
+We reserve the right, at our sole discretion, to modify or replace these Terms at any time. By continuing to use or access our Service after revisions become effective, you agree to be bound by the revised terms. If you do not agree to revised terms, please do not use the Service.
+\ No newline at end of file
diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index a0780d64..d3ed008c 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -16,13 +16,10 @@ authors: Adam Harvey
 <section class="about-menu">
 <ul>
 <li><a href="/about/">About</a></li>
-<li><a href="/about/faq/">FAQs</a></li>
 <li><a class="current" href="/about/press/">Press</a></li>
-<li><a href="/about/terms/">Terms</a></li>
-<li><a href="/about/privacy/">Privacy</a></li>
+<li><a href="/about/attribution/">Attribution</a></li>
+<li><a href="/about/legal/">Legal / Privacy</a></li>
 </ul>
 </section>
 
-(TEMPORARY PAGE)
-
 - Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset>
 \ No newline at end of file