Is this still a good name for this function?