I would change this one back to be more consistent with the rest of this function