24.10.2013(refactoring)