Do we need to make this public?