oops, missed a refactor.