added field + refactoring