diff --git a/fieldExtraction/constants/regex_patterns.py b/fieldExtraction/constants/regex_patterns.py
index d3e92cb..45861af 100644
--- a/fieldExtraction/constants/regex_patterns.py
+++ b/fieldExtraction/constants/regex_patterns.py
@@ -9,7 +9,7 @@ TRIPLE_BACKTICK_PATTERN = r"```([^`]+)```"
 # )
 # NPI_PATTERN = r"\b\d{10}\b"
 TIN_PATTERN = r"\b(?:\d[\s\-.]*){9}\b"
-FILE_NAME_TIN_PATTERN = r"\b\d{2}[-.]\d{7}\b"
+FILE_NAME_TIN_PATTERN = r"(?<!\d)(?:\d{2}[-.]\d{7}|\d{9})(?!\d)"
 NPI_PATTERN = r"\b(?:\d\s*){10}\b"
 
 
diff --git a/fieldExtraction/src/prompts/investment_prompts.json b/fieldExtraction/src/prompts/investment_prompts.json
index 917ef4b..9ed8ecd 100644
--- a/fieldExtraction/src/prompts/investment_prompts.json
+++ b/fieldExtraction/src/prompts/investment_prompts.json
@@ -201,7 +201,7 @@
         "field_name": "CONTRACT_AMENDMENT_NUM",
         "relationship": "one_to_one",
         "field_type": "smart_chunked",
-        "prompt": "Extract the amendment number if this document is an amendment to a contract. Follow these guidelines:\n1. Look for phrases like 'Amendment No. X', 'X Amendment', 'Amendment X to the Agreement', 'Xth Amendment' in the document title, preamble, or header sections.\n2. Return only the numeric value (e.g., for 'Amendment No. 3' return '3').\n3. If the amendment number is written as a word (e.g., 'First Amendment'), convert it to a number (e.g., '1').\n4. If the amendment number is an alphanumeric value, return the whole value (e.g., for '2A' return '2A').\n5. If the amendment number uses Roman numerals (e.g., 'Amendment IV'), convert it to a number (e.g., '4').\n6. If the amendment number includes decimal points (e.g., 'Amendment 2.1'), return the full numeric value (e.g., '2.1').\n7. If multiple amendment numbers appear, return the one most clearly associated with the current document.\n8. If the document is an amendment but the number cannot be determined, return 'UNKNOWN'.\n9. If the document is not an amendment, return 'N/A'.\n10. If the Amendment number contains any leading zeroes(e.g. '001'), Drop all leading zeros (e.g. '1').\n11. If the document is an amendment but the number cannot be determined, return '1'.",
+        "prompt": "Extract the amendment number if this document is an amendment to a contract. Follow these guidelines:\n1. Look for phrases like 'Amendment No. X', 'X Amendment', 'Amendment X to the Agreement', 'Xth Amendment' in the document title, preamble, or header sections.\n2. Return only the numeric value (e.g., for 'Amendment No. 3' return '3').\n3. If the amendment number is written as a word (e.g., 'First Amendment'), convert it to a number (e.g., '1').\n4. If the amendment number is an alphanumeric value, return the whole value (e.g., for '2A' return '2A').\n5. If the amendment number uses Roman numerals (e.g., 'Amendment IV'), convert it to a number (e.g., '4').\n6. If the amendment number includes decimal points (e.g., 'Amendment 2.1'), return the full numeric value (e.g., '2.1').\n7. If multiple amendment numbers appear, return the one most clearly associated with the current document.\n8. If the document is an amendment but the number cannot be determined, return 'UNKNOWN'.\n9. If the document is not an amendment, return 'N/A'.\n10. If the Amendment number contains any leading zeroes(e.g. '001'), Drop all leading zeros (e.g. '1').",
         "retrieval_question": "What is the amendment number of this document? Amendment No., Amendment Number, ordinal amendment, numbered amendment? Amendment to agreement, amendment to contract."
     },
     {
@@ -285,7 +285,7 @@
         "field_name": "EFFECTIVE_DT",
         "relationship": "one_to_one",
         "field_type": "smart_chunked",
-        "prompt": "Please analyze the following contract and extract ONLY the effective date of the CURRENT contract or CURRENT amendment. THE DATE MAY OR MAY NOT BE EXPLICITLY LABELED AS AN EFFECTIVE DATE. Follow these retrieval rules in order:\n\n[RETRIEVAL RULES]\nLOOK FOR dates that appear after these common phrases but not limited to (case-insensitive matching):\n'Effective Date:' FOLLOWED BY a date\n'is entered into as of' FOLLOWED BY a date\n'is made and entered into as of the' FOLLOWED BY a date\n'effective as of' FOLLOWED BY a date\n'shall begin on' FOLLOWED BY a date\n'Effective Date of Agreement:' FOLLOWED BY a date\n'Effective Date of Amendment' FOLLOWED BY a date\n'made this' FOLLOWED BY a date\n'made and entered into' FOLLOWED BY a date\n\nALSO LOOK FOR dates in phrases that semantically indicate an effective date (may or may not be explictly labelled as effective date), even if they do not exactly match the phrases above.\nExamples include but ARE NOT LIMITED TO:\nPhrases indicating when a contract or amendment begins or takes effect, Phrases specifying the start date of the contract or amendment, Phrases defining when the contract or amendment becomes operational, or Any phrase indicating contract or amendment creation or execution date.\n\nIt is possible that the contract will specify that the effective date is derived from elsewhere in the contract.  One specific case is outlined:\n\nSIGNATURE DATE HANDLING:\nPRIMARY RULE: DO NOT USE signature dates unless STRICTLY meeting the criteria below\nWHEN TO USE a signature date: ONLY IF that SPECIFIC signature date has an EXPLICIT statement marking IT as the effective date\nHere are some example scenarios:\n✓ USE: 'Effective Date: 1/13/2024' + 'Date: [blank]' below\n✓ USE: 'Effective Date of Agreement: 2/15/2016' + 'Date: [blank]' below\n\nWHEN NOT TO USE a signature date:\n- Even if there is an empty effective date section or field nearby\nHere are some example scenarios but not limited to:\n✗ DO NOT USE: 'Date: 1/1/2024' + 'Effective Date: [blank]' below\n✗ DO NOT USE: 'Effective Date: [blank]' + 'Date: 1/1/2024' below\n\nSECONDARY RULE – UNREFERENCED DATE NEAR “EFFECTIVE DATE:” LABEL:\nIf no explicit effective date is found in the contract, and the “Effective Date:” label appears with a blank or empty field, you MAY consider a nearby date as the effective date ONLY IF ALL of the following conditions are true:\n- The nearby date is NOT referenced by any signature, title, or labeled field (i.e., it is unassigned or free-floating)\n- Other nearby dates ARE explicitly labeled (e.g., under “Date” near signature lines or roles)\n- The unassigned date appears directly under or beside the “Effective Date:” label\n- The document does not provide a clearer effective date elsewhere\n\nIn such cases, treat the unreferenced date near the “Effective Date:” label as the effective date. Preserve the date's exact format as it appears.\n\n[OUTPUT DATE HANDLING]\nCRITICAL - DATE FORMAT PRESERVATION:\n- You MUST preserve the EXACT format of the date AS IT APPEARS in the document\n- DO NOT modify, standardize, or reformat the date in ANY way\n- Preserve ALL original: Spacing (including multiple spaces), punctuation, separators (commas, hyphens, forward slashes, etc.), leading/trailing spaces, or partial or incomplete dates\n\nExamples of EXACT DATE preservation:\n✓ If document shows: '3-1  , , 03' → return |3-1  , , 03|\n✓ If document shows: 'June  1st,2010' → return |June  1st,2010|\n✓ If document shows: 'Feb  1st day of , 10' → return |Feb  1st day of , 10|\n✓ If document shows: '6 /1/ 2010' → return |6 /1/ 2010|\n✓ If document shows: '12-1-20' → return |12-1-20|\n✓ If document shows: 'made this day of Jan, 2009' → return |day of Jan, 2009|\n✓ If document shows: 'to be effective as of , 20 ( the 'Effective Date').' → return |, 20|\n\nIt is POSSIBLE that the intended effective date could be blank (left blank, not filled), empty, incomplete, or partial. DO NOT ASSUME/INFER anything about the date or its components.\nReturn N/A only if NO valid effective date is found (e.g. cases with blank/empty/incomplete dates/placeholder values).\n\nIF MULTIPLE matches are retrieved:\n- VERIFY that you have PRECISELY followed the retrieval rules\n- If multiple matches are present, PRIORITIZE and SELECT the LATEST date as the answer\n- MAINTAIN the EXACT FORMAT of the selected date as it appears in the document\n\nBefore providing the final answer, SHOW your reasoning:\n- LIST ALL dates found that match patterns in the retrieval rules\n- For EACH date found:\n* EXPLAIN why it is considered for effective date or not\n* Include the EXACT text snippet where the date was found\n- JUSTIFY your final date selection or why N/A is being returned\n\nFinal Answer Format:\n- Your answer MUST be ENCLOSED in |pipes|\n- The text between the pipes MUST be an EXACT COPY of how the date appears in the document\n- DO NOT add or remove ANY characters, spaces, or formatting",
+        "prompt": "Please analyze the following contract and extract ONLY the effective date of the CURRENT contract or CURRENT amendment. THE DATE MAY OR MAY NOT BE EXPLICITLY LABELED AS AN EFFECTIVE DATE. Follow these retrieval rules in order:\n\n[RETRIEVAL RULES]\nLOOK FOR dates that appear after these common phrases but not limited to (case-insensitive matching):\n'Effective Date:' FOLLOWED BY a date\n'is entered into as of' FOLLOWED BY a date\n'is made and entered into as of the' FOLLOWED BY a date\n'effective as of' FOLLOWED BY a date\n'shall begin on' FOLLOWED BY a date\n'Effective Date of Agreement:' FOLLOWED BY a date\n'Effective Date of Amendment' FOLLOWED BY a date\n'made this' FOLLOWED BY a date\n'made and entered into' FOLLOWED BY a date\n\nALSO LOOK FOR dates in phrases that semantically indicate an effective date (may or may not be explictly labelled as effective date), even if they do not exactly match the phrases above.\nExamples include but ARE NOT LIMITED TO:\nPhrases indicating when a contract or amendment begins or takes effect, Phrases specifying the start date of the contract or amendment, Phrases defining when the contract or amendment becomes operational, or Any phrase indicating contract or amendment creation or execution date.\n\nIt is possible that the contract will specify that the effective date is derived from elsewhere in the contract. One specific case is outlined:\n\nSIGNATURE DATE HANDLING:\nPRIMARY RULE: DO NOT USE signature dates unless STRICTLY meeting the criteria below\nWHEN TO USE a signature date: ONLY IF that SPECIFIC signature date has an EXPLICIT statement marking IT as the effective date\nHere are some example scenarios:\n✓ USE: 'Effective Date: 1/13/2024' + 'Date: [blank]' below\n✓ USE: 'Effective Date of Agreement: 2/15/2016' + 'Date: [blank]' below\n\nWHEN NOT TO USE a signature date:\n- Even if there is an empty effective date section or field nearby\nHere are some example scenarios but not limited to:\n✗ DO NOT USE: 'Date: 1/1/2024' + 'Effective Date: [blank]' below\n✗ DO NOT USE: 'Effective Date: [blank]' + 'Date: 1/1/2024' below\n\nSECONDARY RULE – UNREFERENCED DATE NEAR “EFFECTIVE DATE:” LABEL:\nIf no explicit effective date is found in the contract, and the “Effective Date:” label appears with a blank or empty field, you MAY consider a nearby date as the effective date ONLY IF ALL of the following conditions are true:\n- The nearby date is NOT referenced by any signature, title, or labeled field (i.e., it is unassigned or free-floating)\n- Other nearby dates ARE explicitly labeled (e.g., under “Date” near signature lines or roles)\n- The unassigned date appears directly under or beside the “Effective Date:” label\n- The document does not provide a clearer effective date elsewhere\n\nIn such cases, treat the unreferenced date near the “Effective Date:” label as the effective date. Preserve the date's exact format as it appears.\n\n[OUTPUT DATE HANDLING]\nCRITICAL - DATE FORMAT PRESERVATION:\n- You MUST preserve the EXACT format of the date AS IT APPEARS in the document\n- DO NOT modify, standardize, or reformat the date in ANY way\n- Preserve ALL original: Spacing (including multiple spaces), punctuation, separators (commas, hyphens, forward slashes, etc.), leading/trailing spaces, or partial or incomplete dates\n\nExamples of EXACT DATE preservation:\n✓ If document shows: '3-1  , , 03' → return |3-1  , , 03|\n✓ If document shows: 'June  1st,2010' → return |June  1st,2010|\n✓ If document shows: 'Feb  1st day of , 10' → return |Feb  1st day of , 10|\n✓ If document shows: '6 /1/ 2010' → return |6 /1/ 2010|\n✓ If document shows: '12-1-20' → return |12-1-20|\n✓ If document shows: 'made this day of Jan, 2009' → return |day of Jan, 2009|\n✓ If document shows: 'to be effective as of , 20 ( the 'Effective Date').' → return |, 20|\n\nIt is POSSIBLE that the intended effective date could be blank (left blank, not filled), empty, incomplete, or partial. DO NOT ASSUME/INFER anything about the date or its components.\nReturn N/A only if NO valid effective date is found (e.g. cases with blank/empty/incomplete dates/placeholder values).\n\nIF MULTIPLE matches are retrieved:\n- VERIFY that you have PRECISELY followed the retrieval rules\n- PRIORITIZE the effective date of the CURRENT contract or CURRENT amendment over any attachment or exhibit\n- ONLY IF multiple valid effective dates for the CURRENT contract/amendment are found, SELECT the LATEST one\n- MAINTAIN the EXACT FORMAT of the selected date as it appears in the document\n\nBefore providing the final answer, SHOW your reasoning:\n- LIST ALL dates found that match patterns in the retrieval rules\n- For EACH date found:\n* EXPLAIN why it is considered for effective date or not\n* Include the EXACT text snippet where the date was found\n- JUSTIFY your final date selection or why N/A is being returned\n\nFinal Answer Format:\n- Your answer MUST be ENCLOSED in |pipes|\n- The text between the pipes MUST be an EXACT COPY of how the date appears in the document\n- DO NOT add or remove ANY characters, spaces, or formatting",
         "keywords": [
             "effective date",
             "effective date:",
@@ -337,7 +337,7 @@
         "field_name": "AUTO_RENEWAL_IND",
         "relationship": "one_to_one",
         "field_type": "smart_chunked",
-        "prompt": "This pertains to the term and termination section of the contract. If this contract automatically renews, answer Y. If this contract will remain in effect unless terminated, answer Y. Otherwise, answer N.",
+        "prompt": "This pertains to the term and termination section of the contract. If this contract automatically renews, answer Y. If this contract will remain in effect unless terminated, answer Y. Otherwise, answer N. If you cannot determine answer N.",
         "keywords": [
             "Renew",
             "renew",