Restructured for JSFab 2014-1