Move to a public function