modifications before refactoring