Change static function to public