Final commit March 21/2013