Fixing bad refactor/clone from broman project