oh shoot, I forgot to copy in this refactor