== Current Affiliations ==
-Software Engineer, [[https://careers.google.com/locations/tokyo/ | Google Japan]]
-
-[[https://www.google.com/ | GoogleLogoAlpha.png]]
-
----
Coordinator of the Infrastructure Team, Member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
== Former Affiliations ==
+Senior Software Engineer, [[https://careers.google.com/locations/tokyo/ | Google Japan]]
+
+Senior Software Engineer, [[https://careers.google.com/locations/cambridge/ | Google Cambridge]]
+
+[[https://www.google.com/ | GoogleLogoAlpha.png]]
+
+
Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
-----
Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
-[[http://paraguayeduca.org | http://paraguayeduca.org/wp-content/themes/paraguayeduca/img/logo-header.png]]
+[[http://paraguayeduca.org | {{paraguay-educa-logo.png}}]]
-----
Operating System Engineer (full-time volunteer), [[http://laptop.org/ | One Laptop Per Child]]
[[https://laptop.org/ | OlpcLogoAlpha.png]]
-----
Contributor, [[http://uclinux.org/ | uClinux]]