refactor, actually change the code on all the paths.