removed old version
refactoring