Move this out of helper function?