Should we make this func private?