== 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]]
----
-Founder, [[http://www.develer.com/ | Develer s.r.l.]]
+Co-Founder, [[http://www.develer.com/ | Develer s.r.l.]]
[[https://www.develer.com/ | https://www.develer.com/static/24cd940103cdcce952fb151fbc08e1bea2e14640/dist/logos-s110a2ffa1b.png]]
----
-Contributor, former System Architect, [[https://github.com/develersrl/bertos | BeRTOS]]
+Lead Architect, [[https://github.com/develersrl/bertos | BeRTOS]]
[[https://github.com/develersrl/bertos | http://www.bertos.org/media/bertos/avatars/bertos-en.png]]
== 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-small.png]]
-----
Operating System Engineer (full-time volunteer), [[http://laptop.org/ | One Laptop Per Child]]
[[https://laptop.org/ | OlpcLogoAlpha.png]]
-----
Contributor, [[http://uclinux.org/ | uClinux]]
-[[https://uclinux.org/ | https://www.uclinux.org/images/logo.gif]]
\ No newline at end of file
+[[http://www.uclinux.org/ | http://www.uclinux.org/images/logo.gif]]
\ No newline at end of file