15/03/2013:  Refactoring