Add public function back