reverted to previous version
refactoring