addtional refactoring - build fails