Compare commits

base: Volian:4f0548fd6029db4b4862a82ff261708587b99dd1

Branches Tags

Volian:master Volian:Development Volian:C2025-060 Volian:F2025-042_Vogtle3&4_nonboldCAS Volian:F2025-040_VogtleSingleColAtt_ContActStep_Box Volian:B2025-064 Volian:B2019-140_B2022-099 Volian:C2022-003-Change-Textboxes-to-RTF-3 Volian:F2025-038_Vogtle_3&4_CAS_Formating Volian:F2025-039_Vogtle_3&4_ReplaceWordsUpdate Volian:F2025-037_Vogtle_ReplaceWords_Tweak Volian:C2025-063 Volian:B2025-063 Volian:C2019-036 Volian:B2025-062_Vogtle_AOP_Null_Ref Volian:B2025_060_SectContPrintBug Volian:F2025-036_Vogtle_3_4_rmvExtraSectStyle Volian:F2025-035_Vogtle_3_4_substep_tab Volian:F2025-034_VogtleTransitions Volian:F2025-033_Vogtle_3&4_Remove_Operator_Actions Volian:B2025-058_061_Vogtle_TransitionFix Volian:F2025-031_Vogtle3&4_ReplaceWordsFix Volian:C2021-035 Volian:F2025-030_Vogtle_End Volian:F2025-029_Vogtle_Westinghouse_Footer Volian:B2021-092 Volian:B2025-053 Volian:B2025-056 Volian:C2024-047 Volian:F2025-028_Vogtle3_4_Bold_RNO Volian:F2025-027_Vogtle_3_4_Backgrounds_PSI Volian:B2025-057 Volian:B2025-055 Volian:B2025-054 Volian:F2025-026_Vogtle_Background_Formats Volian:C2025-053 Volian:F2025_025_Vogtle3&4_SubSect_single_Att Volian:C2025-037 Volian:F2025-024_Vogtle_Dont_Bold_RNO Volian:F2025-023_Vogtle_3_4_Replacewords_Fix Volian:B2025-046_B2025-043_B2024-082 Volian:Vogtle34_EOP_Format_Changes Volian:B2025-051 Volian:B2025-048 Volian:Vogtle_Format_Tweaks_EOPs Volian:C2015-028 Volian:B2025-050_SaveUserSettings Volian:B2025-049 Volian:B2025-047 Volian:F2025-018-019_BVPS_2colAttSect_SetPtUnits Volian:C2025-055 Volian:C2021-058_C2025-052 Volian:C2025-054_UpMinorRev Volian:C2025-034 Volian:C2025-009 Volian:C2025-022-PROMS-FIXES_CHECKIN Volian:C2024-036 Volian:C2025-017_PrintAllApproved Volian:C2025-022-Remove-UCF-2 Volian:B2025-044 Volian:C2025-051 Volian:C2025-001 Volian:C2025-035 Volian:B2025-041-Set-Quick-Print-overwrite-pdf-to-false Volian:B2025-042 Volian:C2025-048-Set-Quick-Print-overwrite-pdf-to-false Volian:B2025-037 Volian:C2025-045 Volian:C2025-049-update_StandardHyphens_AdminTools Volian:C2025-015_ViewMultipleApprovedPDFsOfSameName Volian:B2025-038-Copy-a-step-between-two-screens Volian:C2025-024 Volian:B2025-036-SplitScreen-Print-Error Volian:C2025-039_allowStepTransToAllWordProc Volian:C2025-047-cleanup Volian:C2025-047-AnnotationsTypeSelectChanges Volian:C2025-047-AnnotationsTypeSelectChanges-5 Volian:SQL_Optimization_7_31_2025 Volian:C2025-027-AnnotationsTypeSelect-3 Volian:C2025-027-AnnotationsTypeSelect-2 Volian:C2025-027-AnnotationsTypeSelect Volian:C2025-044 Volian:DEV_Proj_File_Dependency_Update Volian:B2025-039_PropFontColorRplWrds Volian:General_Debugging Volian:C2025-038_EventCalls Volian:F2025-016 Volian:B2025-035-Hold-Procedure-Set-Bug Volian:C2025-023 Volian:C2025-036_CleanupTabCode Volian:B2025-034-Add-error-message-documents-2 Volian:B2025-034-Add-error-message-documents Volian:F2025-015_SharonHarris Volian:B2025-024-Document-Unit-Print Volian:C2025-021 Volian:C2025-023-New-EP-Format-File Volian:F2024-089_BNPP_LOGO Volian:C2025-013 Volian:C2025-028_B2025-032 Volian:DemoFormats Volian:B2025-028 Volian:C2025_031_OptionsTooltips_Cleanup Volian:B2025-031 Volian:B2025-030 Volian:C2025-032 Volian:F2025-012 Volian:B2025-026_B2025-027 Volian:C2025-027-Develop-a-way-to-filter-annotations-so-the-user-can-view-only-the-types-they-want-to-see-EP Volian:F2025-011 Volian:B2025-010 Volian:B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search-2 Volian:B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search Volian:ACME_formats Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options-3 Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options-2 Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options Volian:F2025-004_Ginna Volian:B2025-017-Print-Section-Sub-Section-v2 Volian:DeveloperToolUpdate Volian:B2025-020_UpdateTransitions Volian:B2025-018 Volian:C2025-019 Volian:B2025-015 Volian:C2025-014_PDF_Step_BckMrk_Zoom Volian:B2025-019 Volian:C2024-038_v2 Volian:F2025-002_Farley Volian:B2025-016 Volian:C2024-038 Volian:OrgDotNetBar Volian:B2025-013 Volian:B2025-011-Global-search-is-not-finding-question-marks Volian:DotNetBar_net4.8.1 Volian:CLSA481Build Volian:B2025-014 Volian:B2025-012 Volian:C2025-011 Volian:F2025-001_BNPP Volian:C2019-025_Ability-to-Toggle-Replace-Words-3 Volian:C2025-005 Volian:C2019-025_Ability-to-Toggle-Replace-Words-2 Volian:C2019-025_Ability-to-Toggle-Replace-Words Volian:B2025-005 Volian:C2025-008 Volian:B2025-008 Volian:B2025-007 Volian:C2025-007 Volian:B2025-009 Volian:B2025-004_v2 Volian:B2025-004 Volian:C2025-006_B2025-006 Volian:C2025-003 Volian:B2025-003 Volian:C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-6 Volian:F2024-074-Farley_TOC Volian:C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS Volian:B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty Volian:B2024-062_EmptyProcedure Volian:B2024-068-VCS-Deviation-Format Volian:C2024-005 Volian:C2024-016-Write-Info-to-Results-Window-Delete-Annotations Volian:B2024-046-Set-Default-Tab-In-Admin-Tools Volian:C2024-005-Annotations-Cleanup Volian:B2024-041 Volian:C2024-004_fix Volian:C2021-059 Volian:B2024-032-Fix-Quick-Print

..

compare: Volian:C2024-004_fix

Branches Tags

Volian:master Volian:Development Volian:C2025-060 Volian:F2025-042_Vogtle3&4_nonboldCAS Volian:F2025-040_VogtleSingleColAtt_ContActStep_Box Volian:B2025-064 Volian:B2019-140_B2022-099 Volian:C2022-003-Change-Textboxes-to-RTF-3 Volian:F2025-038_Vogtle_3&4_CAS_Formating Volian:F2025-039_Vogtle_3&4_ReplaceWordsUpdate Volian:F2025-037_Vogtle_ReplaceWords_Tweak Volian:C2025-063 Volian:B2025-063 Volian:C2019-036 Volian:B2025-062_Vogtle_AOP_Null_Ref Volian:B2025_060_SectContPrintBug Volian:F2025-036_Vogtle_3_4_rmvExtraSectStyle Volian:F2025-035_Vogtle_3_4_substep_tab Volian:F2025-034_VogtleTransitions Volian:F2025-033_Vogtle_3&4_Remove_Operator_Actions Volian:B2025-058_061_Vogtle_TransitionFix Volian:F2025-031_Vogtle3&4_ReplaceWordsFix Volian:C2021-035 Volian:F2025-030_Vogtle_End Volian:F2025-029_Vogtle_Westinghouse_Footer Volian:B2021-092 Volian:B2025-053 Volian:B2025-056 Volian:C2024-047 Volian:F2025-028_Vogtle3_4_Bold_RNO Volian:F2025-027_Vogtle_3_4_Backgrounds_PSI Volian:B2025-057 Volian:B2025-055 Volian:B2025-054 Volian:F2025-026_Vogtle_Background_Formats Volian:C2025-053 Volian:F2025_025_Vogtle3&4_SubSect_single_Att Volian:C2025-037 Volian:F2025-024_Vogtle_Dont_Bold_RNO Volian:F2025-023_Vogtle_3_4_Replacewords_Fix Volian:B2025-046_B2025-043_B2024-082 Volian:Vogtle34_EOP_Format_Changes Volian:B2025-051 Volian:B2025-048 Volian:Vogtle_Format_Tweaks_EOPs Volian:C2015-028 Volian:B2025-050_SaveUserSettings Volian:B2025-049 Volian:B2025-047 Volian:F2025-018-019_BVPS_2colAttSect_SetPtUnits Volian:C2025-055 Volian:C2021-058_C2025-052 Volian:C2025-054_UpMinorRev Volian:C2025-034 Volian:C2025-009 Volian:C2025-022-PROMS-FIXES_CHECKIN Volian:C2024-036 Volian:C2025-017_PrintAllApproved Volian:C2025-022-Remove-UCF-2 Volian:B2025-044 Volian:C2025-051 Volian:C2025-001 Volian:C2025-035 Volian:B2025-041-Set-Quick-Print-overwrite-pdf-to-false Volian:B2025-042 Volian:C2025-048-Set-Quick-Print-overwrite-pdf-to-false Volian:B2025-037 Volian:C2025-045 Volian:C2025-049-update_StandardHyphens_AdminTools Volian:C2025-015_ViewMultipleApprovedPDFsOfSameName Volian:B2025-038-Copy-a-step-between-two-screens Volian:C2025-024 Volian:B2025-036-SplitScreen-Print-Error Volian:C2025-039_allowStepTransToAllWordProc Volian:C2025-047-cleanup Volian:C2025-047-AnnotationsTypeSelectChanges Volian:C2025-047-AnnotationsTypeSelectChanges-5 Volian:SQL_Optimization_7_31_2025 Volian:C2025-027-AnnotationsTypeSelect-3 Volian:C2025-027-AnnotationsTypeSelect-2 Volian:C2025-027-AnnotationsTypeSelect Volian:C2025-044 Volian:DEV_Proj_File_Dependency_Update Volian:B2025-039_PropFontColorRplWrds Volian:General_Debugging Volian:C2025-038_EventCalls Volian:F2025-016 Volian:B2025-035-Hold-Procedure-Set-Bug Volian:C2025-023 Volian:C2025-036_CleanupTabCode Volian:B2025-034-Add-error-message-documents-2 Volian:B2025-034-Add-error-message-documents Volian:F2025-015_SharonHarris Volian:B2025-024-Document-Unit-Print Volian:C2025-021 Volian:C2025-023-New-EP-Format-File Volian:F2024-089_BNPP_LOGO Volian:C2025-013 Volian:C2025-028_B2025-032 Volian:DemoFormats Volian:B2025-028 Volian:C2025_031_OptionsTooltips_Cleanup Volian:B2025-031 Volian:B2025-030 Volian:C2025-032 Volian:F2025-012 Volian:B2025-026_B2025-027 Volian:C2025-027-Develop-a-way-to-filter-annotations-so-the-user-can-view-only-the-types-they-want-to-see-EP Volian:F2025-011 Volian:B2025-010 Volian:B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search-2 Volian:B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search Volian:ACME_formats Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options-3 Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options-2 Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options Volian:F2025-004_Ginna Volian:B2025-017-Print-Section-Sub-Section-v2 Volian:DeveloperToolUpdate Volian:B2025-020_UpdateTransitions Volian:B2025-018 Volian:C2025-019 Volian:B2025-015 Volian:C2025-014_PDF_Step_BckMrk_Zoom Volian:B2025-019 Volian:C2024-038_v2 Volian:F2025-002_Farley Volian:B2025-016 Volian:C2024-038 Volian:OrgDotNetBar Volian:B2025-013 Volian:B2025-011-Global-search-is-not-finding-question-marks Volian:DotNetBar_net4.8.1 Volian:CLSA481Build Volian:B2025-014 Volian:B2025-012 Volian:C2025-011 Volian:F2025-001_BNPP Volian:C2019-025_Ability-to-Toggle-Replace-Words-3 Volian:C2025-005 Volian:C2019-025_Ability-to-Toggle-Replace-Words-2 Volian:C2019-025_Ability-to-Toggle-Replace-Words Volian:B2025-005 Volian:C2025-008 Volian:B2025-008 Volian:B2025-007 Volian:C2025-007 Volian:B2025-009 Volian:B2025-004_v2 Volian:B2025-004 Volian:C2025-006_B2025-006 Volian:C2025-003 Volian:B2025-003 Volian:C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-6 Volian:F2024-074-Farley_TOC Volian:C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS Volian:B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty Volian:B2024-062_EmptyProcedure Volian:B2024-068-VCS-Deviation-Format Volian:C2024-005 Volian:C2024-016-Write-Info-to-Results-Window-Delete-Annotations Volian:B2024-046-Set-Default-Tab-In-Admin-Tools Volian:C2024-005-Annotations-Cleanup Volian:B2024-041 Volian:C2024-004_fix Volian:C2021-059 Volian:B2024-032-Fix-Quick-Print

3 Commits

4f0548fd60 ... C2024-004_

Author	SHA1	Message	Date
Kevin Laskey	09d0f73396	Attempted fixes for enhanced tests	2024-07-10 09:25:21 -04:00
Kevin Laskey	96e85e8c5c	C2024-004 - Update Stored Procedure for copy replace	2024-07-09 10:44:26 -04:00
Kevin Laskey	f6f7d6a8c7	C2024-004 Fixed issue related to replacing enhanced procs, double replace would attempt to happen, this prevents that and should allow for enhanced replacements also	2024-07-08 10:20:32 -04:00

335 changed files with 3415 additions and 5103 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Expand all files Collapse all files

BIN

PROMS/Formats/fmtall/AEPAPPRall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/AEPCHID_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/AEPCHIDall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/AEPDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/AEPSAMGFPall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/AEPSAMG_01all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/AEPSAMG_02all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/AEPSAMGall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/AEP_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/AEP_01all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/AEP_02all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/AEPall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BASEall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BGEALNall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BGEEOP_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BGEEOPall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BGEOI_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BGEOIall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BGESAM1all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BGESTPall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BGEVLall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BNPP1Newall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BNPP1all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BNPP2all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BNPPalrall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BNPPbckall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BNPPsamall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPS1all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPS2all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPSAOPDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPSAOPall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPSAtchall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPSBCKall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPSDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPSFlexDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPSNIBCKall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPSSAMGBCKall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPSSAMGDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/BVPSSAMGall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CAL1all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CAL2_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CAL2all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CALBCKall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CALFSGBCKall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CALOTOall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CALSAMall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CATADEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CATBOXall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CATDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CATEBCKall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CATSAMall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CATall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPBCK2NHCall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPBCK2all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPBCKNHC_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPBCKNHC_01all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPBCKNHCall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPBCK_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPBCK_01all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPBCKall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPFDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPFDataall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPLAall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPLRDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPLS2all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPLSAMall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPLSDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPLSSDDall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPLSSUMall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPLSall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPL_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPL_01all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPL_02all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPL_03all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPLall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPSAMGDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CPSAMGDataall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CWEDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CWER_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CWER_01all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CWERall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CWE_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CWE_01all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/CWEall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/ComPeakFlex11all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/ComPeakFlexall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/EBCKall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/EFSGBCKall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/ELFDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/ENall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/ESFDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/EXCLN_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/EXCLN_01all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/EXCLNall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/EXEAOPBCKall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/EXEBCK_00all.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/EXEBCKall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/EXEDEVall.xml

Binary file not shown.

BIN

PROMS/Formats/fmtall/EXEFLXBCKall.xml

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More