Convert to private function for future methods