Refactoring 29.03.2013