getting ready for refactoring
end of this refactoring direction