Changed to static function