6.5.2013 to refactoring