works again after refactoring - not clean
refactoring finished.