run refactored but untested