working on refactoring - rename