22/01/2013 - Some adjusts.