refactoring, added attributes Part II