AH-565 Updates for indicator moved to private function.