Merge pull request #4 from Microsoft/master

Merge with master
2025-08-22 22:23:29 -07:00 · 2019-04-26 15:52:58 -07:00 · 2019-04-26 15:52:58 -07:00 · 869cfface1
commit 869cfface1
parent ba471ed02b 8e1a14793a
196 changed files with 2074 additions and 2308 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -12,29 +12,6 @@
 ###############################################################################
 *.cs     diff=csharp

-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-*.sln       merge=binary
-*.csproj    merge=binary
-*.vbproj    merge=binary
-*.vcxproj   merge=binary
-*.vcproj    merge=binary
-*.dbproj    merge=binary
-*.fsproj    merge=binary
-*.lsproj    merge=binary
-*.wixproj   merge=binary
-*.modelproj merge=binary
-*.sqlproj   merge=binary
-*.wwaproj   merge=binary
-
 ###############################################################################
 # behavior for image files
 #
--- a/.gitignore
+++ b/.gitignore
@ -289,6 +289,7 @@ __pycache__/

 # Calculator specific
 Generated Files/
+src/GraphControl/GraphingImplOverrides.props
 !/build/config/TRexDefs/**
 !src/Calculator/TemporaryKey.pfx
 !src/CalculatorUnitTests/CalculatorUnitTests_TemporaryKey.pfx
--- a/README.md
+++ b/README.md
@ -16,6 +16,9 @@ Calculator ships regularly with new features and bug fixes. You can get the late
 - Calculation history and memory capabilities.
 - Conversion between many units of measurement.
 - Currency conversion based on data retrieved from [Bing](https://www.bing.com).
+- [Infinite precision](https://en.wikipedia.org/wiki/Arbitrary-precision_arithmetic) for basic
+  arithmetic operations (addition, subtraction, multiplication, division) so that calculations
+  never lose precision.

 ## Getting started
 Prerequisites:
--- a/build/config/SignConfig.xml
+++ b/build/config/SignConfig.xml
@ -1,5 +1,5 @@
 <SignConfigXML>
-  <job platform="" configuration="" certSubject="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" jobname="EngFunSimpleSign" approvers="gstolt;vigarg">
+  <job platform="" configuration="" certSubject="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" jobname="EngFunSimpleSign" approvers="">
   <file src="__INPATHROOT__\Microsoft.WindowsCalculator_8wekyb3d8bbwe.appxbundle" signType="136020001" dest="__OUTPATHROOT__\Microsoft.WindowsCalculator_8wekyb3d8bbwe.appxbundle" /> 
  </job>
 </SignConfigXML>
--- a/build/pipelines/azure-pipelines.ci.yaml
+++ b/build/pipelines/azure-pipelines.ci.yaml
@ -33,6 +33,10 @@ jobs:
    platform: ARM64
    condition: not(eq(variables['Build.Reason'], 'PullRequest'))

+- template: ./templates/run-ui-tests.yaml
+  parameters:
+    platform: x64
+
 - template: ./templates/run-unit-tests.yaml
  parameters:
    platform: x64
--- a/build/pipelines/templates/build-single-architecture.yaml
+++ b/build/pipelines/templates/build-single-architecture.yaml
@ -30,7 +30,7 @@ steps:
    inputs:
      solution: src/Calculator.sln
      vsVersion: 15.0
-      msbuildArgs: /bl:$(Build.BinariesDirectory)\$(BuildConfiguration)\$(BuildPlatform)\Calculator.binlog /p:OutDir=$(Build.BinariesDirectory)\$(BuildConfiguration)\$(BuildPlatform)\ /p:GenerateProjectSpecificOutputFolder=true /p:AppVersion=$(Build.BuildNumber) ${{ parameters.extraMsBuildArgs }}
+      msbuildArgs: /bl:$(Build.BinariesDirectory)\$(BuildConfiguration)\$(BuildPlatform)\Calculator.binlog /p:OutDir=$(Build.BinariesDirectory)\$(BuildConfiguration)\$(BuildPlatform)\ /p:GenerateProjectSpecificOutputFolder=true /p:AppVersion=$(Build.BuildNumber) /t:Publish /p:PublishDir=$(Build.BinariesDirectory)\$(BuildConfiguration)\$(BuildPlatform)\publish\ ${{ parameters.extraMsBuildArgs }}
      platform: $(BuildPlatform)
      configuration: $(BuildConfiguration)
      clean: true
--- a/build/pipelines/templates/prepare-release-internalonly.yaml
+++ b/build/pipelines/templates/prepare-release-internalonly.yaml
@ -1,5 +1,5 @@
 # This template contains a job which builds artifacts needed to release the app to the store and to
-# Windows using Microsoft-internal systems. It relies Microsoft-internal resources and will not
+# Windows using Microsoft-internal systems. It relies on Microsoft-internal resources and will not
 # work outside of Microsoft.
 # Specifically, this job:
 # - Signs the bundle using a secure system. If you want to build your own, use SignTool following
@ -28,8 +28,8 @@ jobs:
  - task: PkgESSetupBuild@10
    displayName: Initialize Package ES
    inputs:
-        productName: Calculator
-        disableWorkspace: true
+      productName: Calculator
+      disableWorkspace: true
    env:
      XES_DISABLEPROV: true

@ -46,6 +46,8 @@ jobs:

  - task: PkgESCodeSign@10
    displayName: Send bundle to Package ES code signing service
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
    inputs:
      signConfigXml: build\config\SignConfig.xml
      inPathRoot: $(Build.ArtifactStagingDirectory)\appxBundle
@ -60,25 +62,25 @@ jobs:
  - task: CopyFiles@2
    displayName: Copy signed AppxBundle to vpack staging folder
    inputs:
-        sourceFolder: $(Build.ArtifactStagingDirectory)\appxBundleSigned
-        targetFolder: $(Build.ArtifactStagingDirectory)\vpack\appxBundle
+      sourceFolder: $(Build.ArtifactStagingDirectory)\appxBundleSigned
+      targetFolder: $(Build.ArtifactStagingDirectory)\vpack\appxBundle

  - task: PkgESVPack@10
    displayName: Create and push vpack for app
    env:
-        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
    inputs:
-        sourceDirectory: $(Build.ArtifactStagingDirectory)\vpack\appxBundle
-        description: VPack for the Calculator Application
-        pushPkgName: calculator.app
-        version: $(versionMajor).$(versionMinor).$(versionBuild)
-        owner: paxeeapps
+      sourceDirectory: $(Build.ArtifactStagingDirectory)\vpack\appxBundle
+      description: VPack for the Calculator Application
+      pushPkgName: calculator.app
+      version: $(versionMajor).$(versionMinor).$(versionBuild)
+      owner: paxeeapps

  - task: PublishBuildArtifacts@1
    displayName: Publish vpack\app artifact with vpack manifest
    inputs:
-        pathtoPublish: $(XES_VPACKMANIFESTDIRECTORY)\$(XES_VPACKMANIFESTNAME)
-        artifactName: vpack\app
+      pathtoPublish: $(XES_VPACKMANIFESTDIRECTORY)\$(XES_VPACKMANIFESTNAME)
+      artifactName: vpack\app

    # TODO (macool): create and push internal test packages and test config

--- a/build/pipelines/templates/run-ui-tests.yaml
+++ b/build/pipelines/templates/run-ui-tests.yaml
@ -0,0 +1,52 @@
+# This template contains jobs to run UI tests using WinAppDriver.
+
+parameters:
+  platform: ''
+
+jobs:
+- job: UITests${{ parameters.platform }}
+  displayName: UITests ${{ parameters.platform }}
+  dependsOn: Build${{ parameters.platform }}
+  condition: succeeded()
+  pool:
+    vmImage: windows-2019
+  variables:
+    skipComponentGovernanceDetection: true
+  steps:
+  - checkout: none
+
+  - powershell: Set-DisplayResolution -Width 1920 -Height 1080 -Force
+    displayName: Set resolution to 1920x1080
+    continueOnError: true
+
+  - task: DownloadBuildArtifacts@0
+    displayName: Download AppxBundle and CalculatorUITests
+    inputs:
+      artifactName: drop
+      itemPattern: |
+        drop/Release/${{ parameters.platform }}/Calculator/AppPackages/**
+        drop/Release/${{ parameters.platform }}/publish/**
+
+  - task: PowerShell@2
+    displayName: Install certificate
+    inputs:
+      filePath: $(Build.ArtifactStagingDirectory)/drop/Release/${{ parameters.platform }}/Calculator/AppPackages/Calculator_$(Build.BuildNumber)_Test/Add-AppDevPackage.ps1
+      arguments: -CertificatePath $(Build.ArtifactStagingDirectory)/drop/Release/${{ parameters.platform }}/Calculator/AppPackages/Calculator_$(Build.BuildNumber)_Test/Calculator_$(Build.BuildNumber)_${{ parameters.platform }}.cer -Force
+
+  - task: PowerShell@2
+    displayName: Install app
+    inputs:
+      filePath: $(Build.ArtifactStagingDirectory)/drop/Release/${{ parameters.platform }}/Calculator/AppPackages/Calculator_$(Build.BuildNumber)_Test/Add-AppDevPackage.ps1
+      arguments: -Force
+
+  - powershell: Start-Process -FilePath "C:\Program Files (x86)\Windows Application Driver\WinAppDriver.exe" -Verb RunAs
+    displayName: Start WinAppDriver
+
+  - task: VSTest@2
+    displayName: Run CalculatorUITests
+    inputs:
+      testAssemblyVer2: $(Build.ArtifactStagingDirectory)/drop/Release/${{ parameters.platform }}/publish/CalculatorUITests.dll
+      vsTestVersion: 16.0
+      runSettingsFile: $(Build.ArtifactStagingDirectory)/drop/Release/${{ parameters.platform }}/publish/CalculatorUITests.runsettings
+      platform: ${{ parameters.platform }}
+      configuration: Release
--- a/docs/ApplicationArchitecture.md
+++ b/docs/ApplicationArchitecture.md
@ -153,7 +153,9 @@ The CalcEngine contains the logic for interpreting and performing operations acc

 ### RatPack

-The RatPack (short for Rational Pack) is the core of the Calculator model and contains the logic for performing its mathematical operations. The interface to this layer is defined in [ratpak.h][ratpak.h].
+The RatPack (short for Rational Pack) is the core of the Calculator model and contains the logic for
+performing its mathematical operations (using [infinite precision][Infinite Precision] arithmetic
+instead of regular floating point arithmetic). The interface to this layer is defined in [ratpak.h][ratpak.h].

 [References]:####################################################################################################

--- a/src/CalcManager/CEngine/CalcInput.cpp
+++ b/src/CalcManager/CEngine/CalcInput.cpp
@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
+#include <sstream>
 #include "Header Files/CalcEngine.h"

 using namespace std;
--- a/src/CalcManager/CEngine/CalcUtils.cpp
+++ b/src/CalcManager/CEngine/CalcUtils.cpp
@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
 #include "Header Files/CalcEngine.h"
 #include "Header Files/CalcUtils.h"

--- a/src/CalcManager/CEngine/History.cpp
+++ b/src/CalcManager/CEngine/History.cpp
@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
 #include "Header Files/CalcEngine.h"
 #include "Command.h"
 #include "CalculatorVector.h"
--- a/src/CalcManager/CEngine/Number.cpp
+++ b/src/CalcManager/CEngine/Number.cpp
@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.

-#include "pch.h"
+#include <algorithm>
 #include "Header Files/Number.h"

 using namespace std;
--- a/src/CalcManager/CEngine/Rational.cpp
+++ b/src/CalcManager/CEngine/Rational.cpp
@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.

-#include "pch.h"
+#include <intsafe.h>
 #include "Header Files/Rational.h"

 using namespace std;
@ -182,6 +182,13 @@ namespace CalcEngine
        return *this;
    }

+    /// <summary>
+    /// Calculate the remainder after division, the sign of a result will match the sign of the current object.
+    /// </summary>
+    /// <remarks>
+    /// This function has the same behavior as the standard C/C++ operator '%'
+    /// to calculate the modulus after division instead, use <see cref="RationalMath::Mod"/> instead.
+    /// </remarks>
    Rational& Rational::operator%=(Rational const& rhs)
    {
        PRAT lhsRat = this->ToPRAT();
@ -189,7 +196,7 @@ namespace CalcEngine

        try
        {
-            modrat(&lhsRat, rhsRat);
+            remrat(&lhsRat, rhsRat);
            destroyrat(rhsRat);
        }
        catch (uint32_t error)
@ -342,6 +349,12 @@ namespace CalcEngine
        return lhs;
    }

+    /// <summary>
+    /// Calculate the remainder after division, the sign of a result will match the sign of lhs.
+    /// </summary>
+    /// <remarks>
+    /// This function has the same behavior as the standard C/C++ operator '%', to calculate the modulus after division instead, use <see cref="Rational::operator%"/> instead.
+    /// </remarks>
    Rational operator%(Rational lhs, Rational const& rhs)
    {
        lhs %= rhs;
--- a/src/CalcManager/CEngine/RationalMath.cpp
+++ b/src/CalcManager/CEngine/RationalMath.cpp
@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
 #include "Header Files/RationalMath.h"

 using namespace std;
@ -387,3 +386,33 @@ Rational RationalMath::ATanh(Rational const& rat)

    return result;
 }
+
+/// <summary>
+/// Calculate the modulus after division, the sign of the result will match the sign of b.
+/// </summary>
+/// <remarks>
+/// When one of the operand is negative
+/// the result will differ from the C/C++ operator '%'
+/// use <see cref="Rational::operator%"/> instead to calculate the remainder after division.
+/// </remarks>
+Rational RationalMath::Mod(Rational const& a, Rational const& b)
+{
+    PRAT prat = a.ToPRAT();
+    PRAT pn = b.ToPRAT();
+
+    try
+    {
+        modrat(&prat, pn);
+        destroyrat(pn);
+    }
+    catch (uint32_t error)
+    {
+        destroyrat(prat);
+        destroyrat(pn);
+        throw(error);
+    }
+
+    auto res = Rational{ prat };
+    destroyrat(prat);
+    return res;
+}
--- a/src/CalcManager/CEngine/calc.cpp
+++ b/src/CalcManager/CEngine/calc.cpp
@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
+#include <cassert>
 #include "Header Files/CalcEngine.h"
-
 #include "CalculatorResource.h"

 using namespace std;
--- a/src/CalcManager/CEngine/scicomm.cpp
+++ b/src/CalcManager/CEngine/scicomm.cpp
@ -12,7 +12,8 @@
 *
 * Author:
 \****************************************************************************/
-#include "pch.h"
+
+#include <string>
 #include "Header Files/CalcEngine.h"
 #include "Header Files/CalcUtils.h"

@ -390,7 +391,7 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam)
        cleared for CENTR */
        if (nullptr != m_pCalcDisplay)
        {
-            m_pCalcDisplay->SetParenDisplayText(L"");
+            m_pCalcDisplay->SetParenthesisNumber(0);
            m_pCalcDisplay->SetExpressionDisplay(make_shared<CalculatorVector<pair<wstring, int>>>(), make_shared<CalculatorVector<shared_ptr<IExpressionCommand>>>());
        }

@ -594,7 +595,7 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam)
        // Set the "(=xx" indicator.
        if (nullptr != m_pCalcDisplay)
        {
-            m_pCalcDisplay->SetParenDisplayText(m_openParenCount ? to_wstring(m_openParenCount) : L"");
+            m_pCalcDisplay->SetParenthesisNumber(m_openParenCount >= 0 ? static_cast<unsigned int>(m_openParenCount) : 0);
        }

        if (!m_bError)
--- a/src/CalcManager/CEngine/scidisp.cpp
+++ b/src/CalcManager/CEngine/scidisp.cpp
@ -12,7 +12,9 @@
 *
 * Author:
 \****************************************************************************/
-#include "pch.h"
+
+#include <sstream>
+#include <regex>
 #include "Header Files/CalcEngine.h"

 using namespace std;
--- a/src/CalcManager/CEngine/scifunc.cpp
+++ b/src/CalcManager/CEngine/scifunc.cpp
@ -16,7 +16,6 @@
 /***                                                                    ***/
 /***                                                                    ***/
 /**************************************************************************/
-#include "pch.h"
 #include "Header Files/CalcEngine.h"

 using namespace std;
--- a/src/CalcManager/CEngine/scioper.cpp
+++ b/src/CalcManager/CEngine/scioper.cpp
@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
 #include "Header Files/CalcEngine.h"

 using namespace CalcEngine;
@ -78,7 +77,7 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa
        case IDC_DIV:
        case IDC_MOD:
        {
-            int iNumeratorSign = 1, iDenominatorSign = 1, iFinalSign = 1;
+            int iNumeratorSign = 1, iDenominatorSign = 1;
            auto temp = result;
            result = rhs;

@ -107,20 +106,30 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa

            if (operation == IDC_DIV)
            {
-                iFinalSign = iNumeratorSign * iDenominatorSign;
                result /= temp;
+                if (m_fIntegerMode && (iNumeratorSign * iDenominatorSign) == -1)
+                {
+                    result = -(Integer(result));
+                }
            }
            else
            {
-                iFinalSign = iNumeratorSign;
-                result %= temp;
-            }
+                if (m_fIntegerMode)
+                {
+                    // Programmer mode, use remrat (remainder after division)
+                    result %= temp;

-            if (m_fIntegerMode && iFinalSign == -1)
-            {
-                result = -(Integer(result));
+                    if (iNumeratorSign == -1)
+                    {
+                        result = -(Integer(result));
+                    }
+                }
+                else
+                {
+                    //other modes, use modrat (modulus after division)
+                    result = Mod(result, temp);
+                }
            }
-
            break;
        }

--- a/src/CalcManager/CEngine/sciset.cpp
+++ b/src/CalcManager/CEngine/sciset.cpp
@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
 #include "Header Files/CalcEngine.h"

 using namespace CalcEngine;
--- a/src/CalcManager/CalcManager.vcxproj
+++ b/src/CalcManager/CalcManager.vcxproj
@ -157,6 +157,7 @@
      <AdditionalIncludeDirectories>$(SolutionDir)..\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <WarningLevel>Level4</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -173,6 +174,7 @@
      <AdditionalIncludeDirectories>$(SolutionDir)..\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <WarningLevel>Level4</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -189,6 +191,7 @@
      <AdditionalIncludeDirectories>$(SolutionDir)..\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <WarningLevel>Level4</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -205,6 +208,7 @@
      <AdditionalIncludeDirectories>$(SolutionDir)..\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <WarningLevel>Level4</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -222,6 +226,7 @@
      <AdditionalIncludeDirectories>$(SolutionDir)..\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <WarningLevel>Level4</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -238,6 +243,7 @@
      <AdditionalIncludeDirectories>$(SolutionDir)..\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <WarningLevel>Level4</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -254,6 +260,7 @@
      <AdditionalIncludeDirectories>$(SolutionDir)..\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <WarningLevel>Level4</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -270,6 +277,7 @@
      <AdditionalIncludeDirectories>$(SolutionDir)..\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <WarningLevel>Level4</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -278,7 +286,6 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClInclude Include="CalcException.h" />
    <ClInclude Include="CalculatorHistory.h" />
    <ClInclude Include="CalculatorManager.h" />
    <ClInclude Include="CalculatorResource.h" />
--- a/src/CalcManager/CalculatorHistory.cpp
+++ b/src/CalcManager/CalculatorHistory.cpp
@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
+#include <cassert>
 #include "CalculatorHistory.h"

 using namespace std;
--- a/src/CalcManager/CalculatorHistory.h
+++ b/src/CalcManager/CalculatorHistory.h
@ -38,7 +38,7 @@ namespace CalculationManager
        void ClearHistory();
        unsigned int AddItem(_In_ std::shared_ptr<HISTORYITEM> const &spHistoryItem);
        bool RemoveItem(unsigned int uIdx);
-        const size_t MaxHistorySize() const { return m_maxHistorySize; }
+        size_t MaxHistorySize() const { return m_maxHistorySize; }
        ~CalculatorHistory(void);

    private:
--- a/src/CalcManager/CalculatorManager.cpp
+++ b/src/CalcManager/CalculatorManager.cpp
@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
+#include <climits> // for UCHAR_MAX
 #include "Header Files/CalcEngine.h"
 #include "CalculatorManager.h"
 #include "CalculatorResource.h"
@ -111,9 +111,9 @@ namespace CalculationManager
    /// Callback from the engine
    /// </summary>
    /// <param name="parenthesisCount">string containing the parenthesis count</param>
-    void CalculatorManager::SetParenDisplayText(const wstring& parenthesisCount)
+    void CalculatorManager::SetParenthesisNumber(_In_ unsigned int parenthesisCount)
    {
-        m_displayCallback->SetParenDisplayText(parenthesisCount);
+        m_displayCallback->SetParenthesisNumber(parenthesisCount);
    }

    /// <summary>
--- a/src/CalcManager/CalculatorManager.h
+++ b/src/CalcManager/CalculatorManager.h
@ -94,7 +94,7 @@ namespace CalculationManager
        void SetExpressionDisplay(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens, _Inout_ std::shared_ptr<CalculatorVector<std::shared_ptr<IExpressionCommand>>> const &commands) override;
        void SetMemorizedNumbers(_In_ const std::vector<std::wstring>& memorizedNumbers) override;
        void OnHistoryItemAdded(_In_ unsigned int addedItemIndex) override;
-        void SetParenDisplayText(const std::wstring& parenthesisCount) override;
+        void SetParenthesisNumber(_In_ unsigned int parenthesisCount) override;
        void OnNoRightParenAdded() override;
        void DisplayPasteError();
        void MaxDigitsReached() override;
--- a/src/CalcManager/CalculatorVector.h
+++ b/src/CalcManager/CalculatorVector.h
@ -1,9 +1,14 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

 #pragma once

+#include <string>
+#include <vector>
+#include <winerror.h>
 #include "Ratpack/CalcErr.h"
+#include <stdexcept> // for std::out_of_range
+#include <sal.h> // for SAL

 template <typename TType>
 class CalculatorVector
--- a/src/CalcManager/Command.h
+++ b/src/CalcManager/Command.h
@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

 #pragma once
--- a/src/CalcManager/ExpressionCommand.cpp
+++ b/src/CalcManager/ExpressionCommand.cpp
@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
+#include <string>
 #include "Header Files/CCommand.h"
 #include "CalculatorVector.h"
 #include "ExpressionCommand.h"
--- a/src/CalcManager/ExpressionCommandInterface.h
+++ b/src/CalcManager/ExpressionCommandInterface.h
@ -1,7 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

 #pragma once
+
+#include <memory> // for std::shared_ptr
 #include "CalculatorVector.h"
 #include "Command.h"

--- a/src/CalcManager/Header
+++ b/src/CalcManager/Header
@ -13,6 +13,8 @@
 *
 \****************************************************************************/

+#pragma once
+
 // The following are the valid id's which can be passed to CCalcEngine::ProcessCommand

 #define IDM_HEX           313
--- a/src/CalcManager/Header
+++ b/src/CalcManager/Header
@ -45,7 +45,7 @@ namespace CalculationManager
    class IResourceProvider;
 }

-namespace CalculatorUnitTests
+namespace CalculatorEngineTests
 {
    class CalcEngineTests;
 }
@ -160,5 +160,5 @@ private:
    static void ChangeBaseConstants(uint32_t radix, int maxIntDigits, int32_t precision);
    void BaseOrPrecisionChanged();

-    friend class CalculatorUnitTests::CalcEngineTests;
+    friend class CalculatorEngineTests::CalcEngineTests;
 };
--- a/src/CalcManager/Header
+++ b/src/CalcManager/Header
@ -13,6 +13,11 @@
 * Created: 13-Feb-2008
 *
 \****************************************************************************/
+
+#pragma once
+
+#include <string>
+
 inline constexpr auto IDS_ERRORS_FIRST = 99;

 // This is the list of error strings corresponding to SCERR_DIVIDEZERO..
--- a/src/CalcManager/Header
+++ b/src/CalcManager/Header
@ -3,6 +3,7 @@

 #pragma once

+#include <array>
 #include "ICalcDisplay.h"
 #include "IHistoryDisplay.h"
 #include "Rational.h"
--- a/src/CalcManager/Header
+++ b/src/CalcManager/Header
@ -12,7 +12,7 @@ public:
    virtual void SetPrimaryDisplay(const std::wstring& pszText, bool isError) = 0;
    virtual void SetIsInError(bool isInError) = 0;
    virtual void SetExpressionDisplay(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens, _Inout_ std::shared_ptr<CalculatorVector<std::shared_ptr<IExpressionCommand>>> const &commands) = 0;
-    virtual void SetParenDisplayText(const std::wstring& pszText) = 0;
+    virtual void SetParenthesisNumber(_In_ unsigned int count) = 0;
    virtual void OnNoRightParenAdded() = 0;
    virtual void MaxDigitsReached() = 0; // not an error but still need to inform UI layer.
    virtual void BinaryOperatorReceived() = 0;
--- a/src/CalcManager/Header
+++ b/src/CalcManager/Header
@ -3,6 +3,7 @@

 #pragma once

+#include <vector>
 #include "Ratpack/ratpak.h"

 namespace CalcEngine
--- a/src/CalcManager/Header
+++ b/src/CalcManager/Header
@ -13,6 +13,7 @@ namespace CalcEngine::RationalMath
    Rational Pow(Rational const& base, Rational const& pow);
    Rational Root(Rational const& base, Rational const& root);
    Rational Fact(Rational const& rat);
+    Rational Mod(Rational const& a, Rational const& b);

    Rational Exp(Rational const& rat);
    Rational Log(Rational const& rat);
--- a/src/CalcManager/Ratpack/basex.cpp
+++ b/src/CalcManager/Ratpack/basex.cpp
@ -14,8 +14,8 @@
 //  internal base is a power of 2.
 //
 //-----------------------------------------------------------------------------
-#include "pch.h"
 #include "ratpak.h"
+#include <cstring> // for memmove

 void _mulnumx( PNUMBER *pa, PNUMBER b );

--- a/src/CalcManager/Ratpack/conv.cpp
+++ b/src/CalcManager/Ratpack/conv.cpp
@ -17,7 +17,10 @@
 //
 //---------------------------------------------------------------------------

-#include "pch.h"
+#include <algorithm>
+#include <winerror.h>
+#include <sstream>
+#include <cstring> // for memmove, memcpy
 #include "ratpak.h"

 using namespace std;
--- a/src/CalcManager/Ratpack/exp.cpp
+++ b/src/CalcManager/Ratpack/exp.cpp
@ -14,7 +14,6 @@
 //
 //
 //-----------------------------------------------------------------------------
-#include "pch.h"
 #include "ratpak.h"


@ -408,7 +407,7 @@ void powratNumeratorDenominator(PRAT *px, PRAT y, uint32_t radix, int32_t precis
 //---------------------------------------------------------------------------
 void powratcomp(PRAT *px, PRAT y, uint32_t radix, int32_t precision)
 {
-    int32_t sign = ((*px)->pp->sign * (*px)->pq->sign);
+    int32_t sign = SIGN(*px);

    // Take the absolute value
    (*px)->pp->sign = 1;
--- a/src/CalcManager/Ratpack/fact.cpp
+++ b/src/CalcManager/Ratpack/fact.cpp
@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

 //-----------------------------------------------------------------------------
@ -13,7 +13,6 @@
 //     Contains fact(orial) and supporting _gamma functions.
 //
 //-----------------------------------------------------------------------------
-#include "pch.h"
 #include "ratpak.h"


@ -216,7 +215,7 @@ void factrat( PRAT *px, uint32_t radix, int32_t precision)

    // Check for negative integers and throw an error.
    if ( ( zerrat(frac) || ( LOGRATRADIX(frac) <= -precision) ) &&
-        ( (*px)->pp->sign * (*px)->pq->sign == -1 ) )
+        ( SIGN(*px) == -1 ) )
        {
        throw CALC_E_DOMAIN;
        }
--- a/src/CalcManager/Ratpack/itrans.cpp
+++ b/src/CalcManager/Ratpack/itrans.cpp
@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

 //-----------------------------------------------------------------------------
@ -15,7 +15,6 @@
 //  Special Information
 //
 //-----------------------------------------------------------------------------
-#include "pch.h"
 #include "ratpak.h"


@ -92,11 +91,9 @@ void asinanglerat( _Inout_ PRAT *pa, ANGLE_TYPE angletype, uint32_t radix, int32
 void asinrat( PRAT *px, uint32_t radix, int32_t precision)

 {
-    int32_t sgn;
    PRAT pret= nullptr;
    PRAT phack= nullptr;
-
-    sgn = (*px)->pp->sign* (*px)->pq->sign;
+    int32_t sgn = SIGN(*px);

    (*px)->pp->sign = 1;
    (*px)->pq->sign = 1;
@ -204,9 +201,7 @@ void _acosrat( PRAT *px, int32_t precision)
 void acosrat( PRAT *px, uint32_t radix, int32_t precision)

 {
-    int32_t sgn;
-
-    sgn = (*px)->pp->sign*(*px)->pq->sign;
+    int32_t sgn = SIGN(*px);

    (*px)->pp->sign = 1;
    (*px)->pq->sign = 1;
@ -291,10 +286,8 @@ void _atanrat( PRAT *px, int32_t precision)
 void atanrat( PRAT *px, uint32_t radix, int32_t precision)

 {
-    int32_t sgn;
    PRAT tmpx= nullptr;
-
-    sgn = (*px)->pp->sign * (*px)->pq->sign;
+    int32_t sgn = SIGN(*px);

    (*px)->pp->sign = 1;
    (*px)->pq->sign = 1;
--- a/src/CalcManager/Ratpack/itransh.cpp
+++ b/src/CalcManager/Ratpack/itransh.cpp
@ -16,7 +16,6 @@
 //
 //
 //-----------------------------------------------------------------------------
-#include "pch.h"
 #include "ratpak.h"


--- a/src/CalcManager/Ratpack/logic.cpp
+++ b/src/CalcManager/Ratpack/logic.cpp
@ -13,59 +13,58 @@
 //     Contains routines for and, or, xor, not and other support
 //
 //---------------------------------------------------------------------------
-#include "pch.h"
 #include "ratpak.h"

 using namespace std;

-void lshrat( PRAT *pa, PRAT b, uint32_t radix, int32_t precision)
+void lshrat(PRAT *pa, PRAT b, uint32_t radix, int32_t precision)

 {
-    PRAT pwr= nullptr;
+    PRAT pwr = nullptr;
    int32_t intb;

    intrat(pa, radix, precision);
-    if ( !zernum( (*pa)->pp ) )
-        {
+    if (!zernum((*pa)->pp))
+    {
        // If input is zero we're done.
-        if ( rat_gt( b, rat_max_exp, precision) )
-            {
+        if (rat_gt(b, rat_max_exp, precision))
+        {
            // Don't attempt lsh of anything big
-            throw( CALC_E_DOMAIN );
-            }
+            throw(CALC_E_DOMAIN);
+        }
        intb = rattoi32(b, radix, precision);
-        DUPRAT(pwr,rat_two);
+        DUPRAT(pwr, rat_two);
        ratpowi32(&pwr, intb, precision);
        mulrat(pa, pwr, precision);
        destroyrat(pwr);
-        }
+    }
 }

-void rshrat( PRAT *pa, PRAT b, uint32_t radix, int32_t precision)
+void rshrat(PRAT *pa, PRAT b, uint32_t radix, int32_t precision)

 {
-    PRAT pwr= nullptr;
+    PRAT pwr = nullptr;
    int32_t intb;

    intrat(pa, radix, precision);
-    if ( !zernum( (*pa)->pp ) )
-        {
+    if (!zernum((*pa)->pp))
+    {
        // If input is zero we're done.
-        if ( rat_lt( b, rat_min_exp, precision) )
-            {
+        if (rat_lt(b, rat_min_exp, precision))
+        {
            // Don't attempt rsh of anything big and negative.
-            throw( CALC_E_DOMAIN );
-            }
+            throw(CALC_E_DOMAIN);
+        }
        intb = rattoi32(b, radix, precision);
-        DUPRAT(pwr,rat_two);
+        DUPRAT(pwr, rat_two);
        ratpowi32(&pwr, intb, precision);
        divrat(pa, pwr, precision);
        destroyrat(pwr);
-       }
+    }
 }

-void boolrat( PRAT *pa, PRAT b, int func, uint32_t radix, int32_t precision);
-void boolnum( PNUMBER *pa, PNUMBER b, int func );
+void boolrat(PRAT *pa, PRAT b, int func, uint32_t radix, int32_t precision);
+void boolnum(PNUMBER *pa, PNUMBER b, int func);


 enum {
@ -74,22 +73,22 @@ enum {
    FUNC_XOR
 } BOOL_FUNCS;

-void andrat( PRAT *pa, PRAT b, uint32_t radix, int32_t precision)
+void andrat(PRAT *pa, PRAT b, uint32_t radix, int32_t precision)

 {
-    boolrat( pa, b, FUNC_AND, radix, precision);
+    boolrat(pa, b, FUNC_AND, radix, precision);
 }

-void orrat( PRAT *pa, PRAT b, uint32_t radix, int32_t precision)
+void orrat(PRAT *pa, PRAT b, uint32_t radix, int32_t precision)

 {
-    boolrat( pa, b, FUNC_OR, radix, precision);
+    boolrat(pa, b, FUNC_OR, radix, precision);
 }

-void xorrat( PRAT *pa, PRAT b, uint32_t radix, int32_t precision)
+void xorrat(PRAT *pa, PRAT b, uint32_t radix, int32_t precision)

 {
-    boolrat( pa, b, FUNC_XOR, radix, precision);
+    boolrat(pa, b, FUNC_XOR, radix, precision);
 }

 //---------------------------------------------------------------------------
@ -104,15 +103,15 @@ void xorrat( PRAT *pa, PRAT b, uint32_t radix, int32_t precision)
 //
 //---------------------------------------------------------------------------

-void boolrat( PRAT *pa, PRAT b, int func, uint32_t radix, int32_t precision)
+void boolrat(PRAT *pa, PRAT b, int func, uint32_t radix, int32_t precision)

 {
-    PRAT tmp= nullptr;
-    intrat( pa, radix, precision);
-    DUPRAT(tmp,b);
-    intrat( &tmp, radix, precision);
+    PRAT tmp = nullptr;
+    intrat(pa, radix, precision);
+    DUPRAT(tmp, b);
+    intrat(&tmp, radix, precision);

-    boolnum( &((*pa)->pp), tmp->pp, func );
+    boolnum(&((*pa)->pp), tmp->pp, func);
    destroyrat(tmp);
 }

@ -130,11 +129,11 @@ void boolrat( PRAT *pa, PRAT b, int func, uint32_t radix, int32_t precision)
 //
 //---------------------------------------------------------------------------

-void boolnum( PNUMBER *pa, PNUMBER b, int func )
+void boolnum(PNUMBER *pa, PNUMBER b, int func)

 {
-    PNUMBER c= nullptr;
-    PNUMBER a= nullptr;
+    PNUMBER c = nullptr;
+    PNUMBER a = nullptr;
    MANTTYPE *pcha;
    MANTTYPE *pchb;
    MANTTYPE *pchc;
@ -143,26 +142,26 @@ void boolnum( PNUMBER *pa, PNUMBER b, int func )
    MANTTYPE da;
    MANTTYPE db;

-    a=*pa;
-    cdigits = max( a->cdigit+a->exp, b->cdigit+b->exp ) -
-            min( a->exp, b->exp );
-    createnum( c, cdigits );
-    c->exp = min( a->exp, b->exp );
+    a = *pa;
+    cdigits = max(a->cdigit + a->exp, b->cdigit + b->exp) -
+        min(a->exp, b->exp);
+    createnum(c, cdigits);
+    c->exp = min(a->exp, b->exp);
    mexp = c->exp;
    c->cdigit = cdigits;
    pcha = a->mant;
    pchb = b->mant;
    pchc = c->mant;
-    for ( ;cdigits > 0; cdigits--, mexp++ )
+    for (; cdigits > 0; cdigits--, mexp++)
+    {
+        da = (((mexp >= a->exp) && (cdigits + a->exp - c->exp >
+            (c->cdigit - a->cdigit))) ?
+            *pcha++ : 0);
+        db = (((mexp >= b->exp) && (cdigits + b->exp - c->exp >
+            (c->cdigit - b->cdigit))) ?
+            *pchb++ : 0);
+        switch (func)
        {
-        da = ( ( ( mexp >= a->exp ) && ( cdigits + a->exp - c->exp >
-                    (c->cdigit - a->cdigit) ) ) ?
-                    *pcha++ : 0 );
-        db = ( ( ( mexp >= b->exp ) && ( cdigits + b->exp - c->exp >
-                    (c->cdigit - b->cdigit) ) ) ?
-                    *pchb++ : 0 );
-        switch ( func )
-            {
        case FUNC_AND:
            *pchc++ = da & db;
            break;
@ -172,15 +171,51 @@ void boolnum( PNUMBER *pa, PNUMBER b, int func )
        case FUNC_XOR:
            *pchc++ = da ^ db;
            break;
-            }
        }
+    }
    c->sign = a->sign;
-    while ( c->cdigit > 1 && *(--pchc) == 0 )
-        {
+    while (c->cdigit > 1 && *(--pchc) == 0)
+    {
        c->cdigit--;
-        }
-    destroynum( *pa );
-    *pa=c;
+    }
+    destroynum(*pa);
+    *pa = c;
+}
+
+//-----------------------------------------------------------------------------
+//
+//    FUNCTION: remrat
+//
+//    ARGUMENTS: pointer to a rational a second rational.
+//
+//    RETURN: None, changes pointer.
+//
+//    DESCRIPTION: Calculate the remainder of *pa / b,
+//                 equivalent of 'pa % b' in C/C++ and produces a result
+//                 that is either zero or has the same sign as the dividend.
+//
+//-----------------------------------------------------------------------------
+
+void remrat(PRAT *pa, PRAT b)
+
+{
+    if (zerrat(b))
+    {
+        throw CALC_E_INDEFINITE;
+    }
+
+    PRAT tmp = nullptr;
+    DUPRAT(tmp, b);
+
+    mulnumx(&((*pa)->pp), tmp->pq);
+    mulnumx(&(tmp->pp), (*pa)->pq);
+    remnum(&((*pa)->pp), tmp->pp, BASEX);
+    mulnumx(&((*pa)->pq), tmp->pq);
+
+    // Get *pa back in the integer over integer form.
+    RENORMALIZE(*pa);
+
+    destroyrat(tmp);
 }

 //-----------------------------------------------------------------------------
@ -191,28 +226,38 @@ void boolnum( PNUMBER *pa, PNUMBER b, int func )
 //
 //    RETURN: None, changes pointer.
 //
-//    DESCRIPTION: Does the rational equivalent of frac(*pa);
+//    DESCRIPTION: Calculate the remainder of *pa / b, with the sign of the result
+//                 either zero or has the same sign as the divisor. 
+//    NOTE: When *pa or b are negative, the result won't be the same as
+//          the C/C++ operator %, use remrat if it's the behavior you expect. 
 //
 //-----------------------------------------------------------------------------

-void modrat( PRAT *pa, PRAT b )
-
+void modrat(PRAT *pa, PRAT b)
 {
+    //contrary to remrat(X, 0) returning 0, modrat(X, 0) must return X
+    if (zerrat(b))
+    {
+        return;
+    }
+
    PRAT tmp = nullptr;
+    DUPRAT(tmp, b);

-    if ( zerrat( b ) )
-        {
-        throw CALC_E_INDEFINITE;
-        }
-    DUPRAT(tmp,b);
+    auto needAdjust = (SIGN(*pa) == -1 ? (SIGN(b) == 1) : (SIGN(b) == -1));

-    mulnumx( &((*pa)->pp), tmp->pq );
-    mulnumx( &(tmp->pp), (*pa)->pq );
-    remnum( &((*pa)->pp), tmp->pp, BASEX );
-    mulnumx( &((*pa)->pq), tmp->pq );
+    mulnumx(&((*pa)->pp), tmp->pq);
+    mulnumx(&(tmp->pp), (*pa)->pq);
+    remnum(&((*pa)->pp), tmp->pp, BASEX);
+    mulnumx(&((*pa)->pq), tmp->pq);
+
+    if (needAdjust && !zerrat(*pa))
+    {
+        addrat(pa, b, BASEX);
+    }

    // Get *pa back in the integer over integer form.
    RENORMALIZE(*pa);

-    destroyrat( tmp );
+    destroyrat(tmp);
 }
--- a/src/CalcManager/Ratpack/num.cpp
+++ b/src/CalcManager/Ratpack/num.cpp
@ -17,7 +17,8 @@
 //
 //
 //-----------------------------------------------------------------------------
-#include "pch.h"
+#include <list>
+#include <cstring> // for memmove
 #include "ratpak.h"

 using namespace std;
--- a/src/CalcManager/Ratpack/rat.cpp
+++ b/src/CalcManager/Ratpack/rat.cpp
@ -16,7 +16,6 @@
 //
 //-----------------------------------------------------------------------------

-#include "pch.h"
 #include "ratpak.h"

 using namespace std;
--- a/src/CalcManager/Ratpack/ratpak.h
+++ b/src/CalcManager/Ratpack/ratpak.h
@ -17,7 +17,11 @@
 //
 //-----------------------------------------------------------------------------

+#include <algorithm>
+#include <string>
 #include "CalcErr.h"
+#include <cstring> // for memmove
+#include <sal.h> // for SAL

 static constexpr uint32_t BASEXPWR = 31L;// Internal log2(BASEX)
 static constexpr uint32_t BASEX = 0x80000000; // Internal radix used in calculations, hope to raise
@ -148,6 +152,9 @@ extern PRAT rat_min_i32;
 #define LOGNUM2(pnum) ((pnum)->cdigit+(pnum)->exp)
 #define LOGRAT2(prat) (LOGNUM2((prat)->pp)-LOGNUM2((prat)->pq))

+// SIGN returns the sign of the rational
+#define SIGN(prat) ((prat)->pp->sign*(prat)->pq->sign)
+
 #if defined( DEBUG_RATPAK )
 //-----------------------------------------------------------------------------
 //
@ -423,7 +430,8 @@ extern void divnumx( _Inout_ PNUMBER *pa, _In_ PNUMBER b, int32_t precision);
 extern void divrat( _Inout_ PRAT *pa, _In_ PRAT b, int32_t precision);
 extern void fracrat( _Inout_ PRAT *pa , uint32_t radix, int32_t precision);
 extern void factrat( _Inout_ PRAT *pa, uint32_t radix, int32_t precision);
-extern void modrat( _Inout_ PRAT *pa, _In_ PRAT b );
+extern void remrat(_Inout_ PRAT *pa, _In_ PRAT b);
+extern void modrat(_Inout_ PRAT *pa, _In_ PRAT b);
 extern void gcdrat( _Inout_ PRAT *pa, int32_t precision);
 extern void intrat( _Inout_ PRAT *px, uint32_t radix, int32_t precision);
 extern void mulnum( _Inout_ PNUMBER *pa, _In_ PNUMBER b, uint32_t radix);
--- a/src/CalcManager/Ratpack/support.cpp
+++ b/src/CalcManager/Ratpack/support.cpp
@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

 //----------------------------------------------------------------------------
@ -18,7 +18,9 @@
 //
 //----------------------------------------------------------------------------

-#include "pch.h"
+#include <string>
+#include <cstring> // for memmove
+#include <iostream> // for wostream
 #include "ratpak.h"

 using namespace std;
@ -296,7 +298,7 @@ void intrat( PRAT *px, uint32_t radix, int32_t precision)
        // Subtract the fractional part of the rational
        PRAT pret = nullptr;
        DUPRAT(pret,*px);
-        modrat( &pret, rat_one );
+        remrat( &pret, rat_one );

        subrat( px, pret, precision);
        destroyrat( pret );
@ -348,8 +350,7 @@ bool rat_ge( PRAT a, PRAT b, int32_t precision)
    b->pp->sign *= -1;
    addrat( &rattmp, b, precision);
    b->pp->sign *= -1;
-    bool bret = ( zernum( rattmp->pp ) ||
-        rattmp->pp->sign * rattmp->pq->sign == 1 );
+    bool bret = ( zernum( rattmp->pp ) || SIGN(rattmp) == 1 );
    destroyrat( rattmp );
    return( bret );
 }
@ -374,8 +375,7 @@ bool rat_gt( PRAT a, PRAT b, int32_t precision)
    b->pp->sign *= -1;
    addrat( &rattmp, b, precision);
    b->pp->sign *= -1;
-    bool bret = ( !zernum( rattmp->pp ) &&
-        rattmp->pp->sign * rattmp->pq->sign == 1 );
+    bool bret = ( !zernum( rattmp->pp ) && SIGN(rattmp) == 1 );
    destroyrat( rattmp );
    return( bret );
 }
@ -400,8 +400,7 @@ bool rat_le( PRAT a, PRAT b, int32_t precision)
    b->pp->sign *= -1;
    addrat( &rattmp, b, precision);
    b->pp->sign *= -1;
-    bool bret = ( zernum( rattmp->pp ) ||
-        rattmp->pp->sign * rattmp->pq->sign == -1 );
+    bool bret = ( zernum( rattmp->pp ) || SIGN(rattmp) == -1 );
    destroyrat( rattmp );
    return( bret );
 }
@ -426,8 +425,7 @@ bool rat_lt( PRAT a, PRAT b, int32_t precision)
    b->pp->sign *= -1;
    addrat( &rattmp, b, precision);
    b->pp->sign *= -1;
-    bool bret = ( !zernum( rattmp->pp ) &&
-        rattmp->pp->sign * rattmp->pq->sign == -1 );
+    bool bret = ( !zernum( rattmp->pp ) && SIGN(rattmp) == -1 );
    destroyrat( rattmp );
    return( bret );
 }
--- a/src/CalcManager/Ratpack/trans.cpp
+++ b/src/CalcManager/Ratpack/trans.cpp
@ -14,7 +14,6 @@
 //
 //----------------------------------------------------------------------------

-#include "pch.h"
 #include "ratpak.h"


--- a/src/CalcManager/Ratpack/transh.cpp
+++ b/src/CalcManager/Ratpack/transh.cpp
@ -14,7 +14,6 @@
 //
 //
 //-----------------------------------------------------------------------------
-#include "pch.h"
 #include "ratpak.h"


--- a/src/CalcManager/UnitConverter.cpp
+++ b/src/CalcManager/UnitConverter.cpp
@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
+#include <cassert>
+#include <sstream>
+#include <algorithm> // for std::sort
 #include "Command.h"
 #include "UnitConverter.h"

@ -63,7 +65,8 @@ UnitConverter::UnitConverter(_In_ const shared_ptr<IConverterDataLoader>& dataLo
    unquoteConversions[L"{sc}"] = L';';
    unquoteConversions[L"{lb}"] = LEFTESCAPECHAR;
    unquoteConversions[L"{rb}"] = RIGHTESCAPECHAR;
-    Reset();
+    ClearValues();
+    ResetCategoriesAndRatios();
 }

 void UnitConverter::Initialize()
@ -75,7 +78,7 @@ bool UnitConverter::CheckLoad()
 {
    if (m_categories.empty())
    {
-        Reset();
+        ResetCategoriesAndRatios();
    }
    return !m_categories.empty();
 }
@ -152,7 +155,6 @@ void UnitConverter::SetCurrentUnitTypes(const Unit& fromType, const Unit& toType
    Calculate();

    UpdateCurrencySymbols();
-    UpdateViewModel();
 }

 /// <summary>
@ -336,7 +338,8 @@ wstring UnitConverter::Serialize()
 /// <param name="serializedData">wstring holding the serialized data. If it does not have expected number of parameters, we will ignore it</param>
 void UnitConverter::DeSerialize(const wstring& serializedData)
 {
-    Reset();
+    ClearValues();
+    ResetCategoriesAndRatios();

    if (serializedData.empty())
    {
@ -403,12 +406,30 @@ void UnitConverter::RestoreUserPreferences(const wstring& userPreferences)
    }

    vector<wstring> outerTokens = StringToVector(userPreferences, L"|");
-    if (outerTokens.size() == 3)
+    if (outerTokens.size() != 3)
    {
-        m_fromType = StringToUnit(outerTokens[0]);
-        m_toType = StringToUnit(outerTokens[1]);
-        m_currentCategory = StringToCategory(outerTokens[2]);
+        return;
    }
+
+    auto fromType = StringToUnit(outerTokens[0]);
+    auto toType = StringToUnit(outerTokens[1]);
+    m_currentCategory = StringToCategory(outerTokens[2]);
+
+    // Only restore from the saved units if they are valid in the current available units.
+    auto itr = m_categoryToUnits.find(m_currentCategory);
+    if (itr != m_categoryToUnits.end())
+    {
+        const auto& curUnits = itr->second;
+        if (find(curUnits.begin(), curUnits.end(), fromType) != curUnits.end())
+        {
+            m_fromType = fromType;
+        }
+        if (find(curUnits.begin(), curUnits.end(), toType) != curUnits.end())
+        {
+            m_toType = toType;
+        }
+    }
+
 }

 /// <summary>
@ -615,7 +636,7 @@ void UnitConverter::SendCommand(Command command)
        clearFront = false;
        clearBack = false;
        ClearValues();
-        Reset();
+        ResetCategoriesAndRatios();
        break;

    default:
@ -634,8 +655,6 @@ void UnitConverter::SendCommand(Command command)
    }

    Calculate();
-
-    UpdateViewModel();
 }

 /// <summary>
@ -824,19 +843,16 @@ vector<tuple<wstring, Unit>> UnitConverter::CalculateSuggested()
        returnVector.push_back(whimsicalReturnVector.at(0));
    }

-    //
-
    return returnVector;
 }

 /// <summary>
-/// Resets the converter to its initial state
+/// Resets categories and ratios
 /// </summary>
-void UnitConverter::Reset()
+void UnitConverter::ResetCategoriesAndRatios()
 {
    m_categories = m_dataLoader->LoadOrderedCategories();

-    ClearValues();
    m_switchedActive = false;

    if (m_categories.empty())
@ -881,7 +897,6 @@ void UnitConverter::Reset()
    }

    InitializeSelectedUnits();
-    Calculate();
 }

 /// <summary>
@ -972,11 +987,21 @@ bool UnitConverter::AnyUnitIsEmpty()
 /// </summary>
 void UnitConverter::Calculate()
 {
-    unordered_map<Unit, ConversionData, UnitHash> conversionTable = m_ratioMap[m_fromType];
-    double returnValue = stod(m_currentDisplay);
-    if (AnyUnitIsEmpty() || (conversionTable[m_toType].ratio == 1.0 && conversionTable[m_toType].offset == 0.0))
+    if (AnyUnitIsEmpty())
    {
        m_returnDisplay = m_currentDisplay;
+        m_returnHasDecimal = m_currentHasDecimal;
+        TrimString(m_returnDisplay);
+        UpdateViewModel();
+        return;
+    }
+
+    unordered_map<Unit, ConversionData, UnitHash> conversionTable = m_ratioMap[m_fromType];
+    double returnValue = stod(m_currentDisplay);
+    if (conversionTable[m_toType].ratio == 1.0 && conversionTable[m_toType].offset == 0.0)
+    {
+        m_returnDisplay = m_currentDisplay;
+        m_returnHasDecimal = m_currentHasDecimal;
        TrimString(m_returnDisplay);
    }
    else
@ -1015,9 +1040,9 @@ void UnitConverter::Calculate()
            m_returnDisplay = returnString;
            TrimString(m_returnDisplay);
        }
+        m_returnHasDecimal = (m_returnDisplay.find(L'.') != m_returnDisplay.npos);
    }
-
-    m_returnHasDecimal = (m_returnDisplay.find(L'.') != m_returnDisplay.npos);
+    UpdateViewModel();
 }

 /// <summary>
--- a/src/CalcManager/UnitConverter.h
+++ b/src/CalcManager/UnitConverter.h
@ -1,8 +1,14 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

 #pragma once

+#include <vector>
+#include <unordered_map>
+#include <ppltasks.h>
+#include <sal.h> // for SAL
+#include <memory> // for std::shared_ptr
+
 namespace UnitConversionManager
 {
    enum class Command;
@ -195,6 +201,8 @@ namespace UnitConversionManager
        virtual void SetViewModelCallback(_In_ const std::shared_ptr<IUnitConverterVMCallback>& newCallback) = 0;
        virtual void SetViewModelCurrencyCallback(_In_ const std::shared_ptr<IViewModelCurrencyCallback>& newCallback) = 0;
        virtual concurrency::task<std::pair<bool, std::wstring>> RefreshCurrencyRatios() = 0;
+        virtual void Calculate() = 0;
+        virtual void ResetCategoriesAndRatios() = 0;
    };

    class UnitConverter : public IUnitConverter, public std::enable_shared_from_this<UnitConverter>
@ -218,6 +226,8 @@ namespace UnitConversionManager
        void SetViewModelCallback(_In_ const std::shared_ptr<IUnitConverterVMCallback>& newCallback) override;
        void SetViewModelCurrencyCallback(_In_ const std::shared_ptr<IViewModelCurrencyCallback>& newCallback) override;
        concurrency::task<std::pair<bool, std::wstring>> RefreshCurrencyRatios() override;
+        void Calculate() override;
+        void ResetCategoriesAndRatios() override;
        // IUnitConverter

        static std::vector<std::wstring> StringToVector(const std::wstring& w, const wchar_t * delimiter, bool addRemainder = false);
@ -228,9 +238,7 @@ namespace UnitConversionManager
        bool CheckLoad();
        double Convert(double value, ConversionData conversionData);
        std::vector<std::tuple<std::wstring, Unit>> CalculateSuggested();
-        void Reset();
        void ClearValues();
-        void Calculate();
        void TrimString(std::wstring& input);
        void InitializeSelectedUnits();
        std::wstring RoundSignificant(double num, int numSignificant);
--- a/src/CalcManager/pch.cpp
+++ b/src/CalcManager/pch.cpp
@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

-#include "pch.h"
+// Intentionally do not include the pch.h here. For projects that don't
+// use precompiled headers, including the header here would force unnecessary compilation.
+// The pch will be included through forced include.
--- a/src/CalcManager/pch.h
+++ b/src/CalcManager/pch.h
@ -3,27 +3,20 @@

 #pragma once

-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
+// The CalcManager project should be able to be compiled with or without a precompiled header
+// in - order to support other toolchains besides MSVC. When adding new system headers, make sure
+// that the relevant source file includes all headers it needs, but then also add the system headers
+// here so that MSVC users see the performance benefit.

-// Windows headers define min/max macros.
-// Disable it for project code.
-#define NOMINMAX
-
-#include <assert.h>
-#include <windows.h>
-#include <winerror.h>
-#include <sstream>
-#include <iostream>
-#include <iterator>
-#include <string>
-#include <memory>
-#include <vector>
-#include <limits>
-#include <list>
-#include <regex>
-#include <unordered_map>
-#include <intsafe.h>
+#include <algorithm>
 #include <array>
+#include <cassert>
+#include <intsafe.h>
+#include <list>
 #include <ppltasks.h>
+#include <regex>
+#include <sstream>
+#include <string>
+#include <unordered_map>
+#include <vector>
+#include <winerror.h>
--- a/src/CalcManager/targetver.h
+++ b/src/CalcManager/targetver.h
@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>
--- a/src/CalcViewModel/ApplicationViewModel.cpp
+++ b/src/CalcViewModel/ApplicationViewModel.cpp
@ -36,7 +36,6 @@ namespace
 {
    StringReference CategoriesPropertyName(L"Categories");
    StringReference ClearMemoryVisibilityPropertyName(L"ClearMemoryVisibility");
-    StringReference AppBarVisibilityPropertyName(L"AppBarVisibility");
 }

 ApplicationViewModel::ApplicationViewModel() :
@ -164,7 +163,6 @@ void ApplicationViewModel::OnModeChanged()

    TraceLogger::GetInstance().LogModeChangeEnd(m_mode, ApplicationView::GetApplicationViewIdForWindow(CoreWindow::GetForCurrentThread()));
    RaisePropertyChanged(ClearMemoryVisibilityPropertyName);
-    RaisePropertyChanged(AppBarVisibilityPropertyName);
 }

 void ApplicationViewModel::OnCopyCommand(Object^ parameter)
@ -189,7 +187,7 @@ void ApplicationViewModel::OnPasteCommand(Object^ parameter)
    {
        ConverterViewModel->OnPasteCommand(parameter);
    }
-    else
+    else if (NavCategory::IsCalculatorViewMode(m_mode))
    {
        CalculatorViewModel->OnPasteCommand(parameter);
    }
--- a/src/CalcViewModel/ApplicationViewModel.h
+++ b/src/CalcViewModel/ApplicationViewModel.h
@ -66,16 +66,6 @@ namespace CalculatorApp
                }
            }

-            property Windows::UI::Xaml::Visibility AppBarVisibility
-            {
-                Windows::UI::Xaml::Visibility get()
-                {
-                    return CalculatorApp::Common::NavCategory::IsCalculatorViewMode(Mode)
-                        ? Windows::UI::Xaml::Visibility::Visible
-                        : Windows::UI::Xaml::Visibility::Collapsed;
-                }
-            }
-
        private:
            bool TryRecoverFromNavigationModeFailure();

--- a/src/CalcViewModel/Common/Automation/NarratorNotifier.cpp
+++ b/src/CalcViewModel/Common/Automation/NarratorNotifier.cpp
@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

 // Implementation of the NarratorNotifier class.
--- a/src/CalcViewModel/Common/CalculatorDisplay.cpp
+++ b/src/CalcViewModel/Common/CalculatorDisplay.cpp
@ -36,7 +36,7 @@ void CalculatorDisplay::SetPrimaryDisplay(_In_ const wstring& displayStringValue
    }
 }

-void CalculatorDisplay::SetParenDisplayText(_In_ const std::wstring& parenthesisCount)
+void CalculatorDisplay::SetParenthesisNumber(_In_ unsigned int parenthesisCount)
 {
    if (m_callbackReference != nullptr)
    {
--- a/src/CalcViewModel/Common/CalculatorDisplay.h
+++ b/src/CalcViewModel/Common/CalculatorDisplay.h
@ -21,7 +21,7 @@ namespace CalculatorApp
        void SetExpressionDisplay(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens, _Inout_ std::shared_ptr<CalculatorVector<std::shared_ptr<IExpressionCommand>>> const &commands) override;
        void SetMemorizedNumbers(_In_ const std::vector<std::wstring>& memorizedNumbers) override;
        void OnHistoryItemAdded(_In_ unsigned int addedItemIndex) override;
-        void SetParenDisplayText(_In_ const std::wstring& parenthesisCount) override;
+        void SetParenthesisNumber(_In_ unsigned int parenthesisCount) override;
        void OnNoRightParenAdded() override;
        void MaxDigitsReached() override;
        void BinaryOperatorReceived() override;
--- a/src/CalcViewModel/Common/CopyPasteManager.cpp
+++ b/src/CalcViewModel/Common/CopyPasteManager.cpp
@ -15,14 +15,15 @@ using namespace Windows::Foundation;
 using namespace Windows::System;
 using namespace Windows::ApplicationModel::DataTransfer;

-unsigned long long maxOperandNumber;
-
 String^ CopyPasteManager::supportedFormats[] =
 {
    StandardDataFormats::Text
 };

-constexpr wstring_view c_validCharacterSet{ L"0123456789()+-*/.abcdefABCDEF" };
+static constexpr wstring_view c_validCharacterSet{ L"0123456789()+-*/.abcdefABCDEF" };
+
+// The below values can not be "constexpr"-ed,
+// as both wstring_view and wchar[] can not be concatenated
 // [\s\x85] means white-space characters
 static const wstring c_wspc = L"[\\s\\x85]*";
 static const wstring c_wspcLParens = c_wspc + L"[(]*" + c_wspc;
@ -103,19 +104,16 @@ task<String^> CopyPasteManager::GetStringToPaste(ViewMode mode, CategoryGroupTyp

 int CopyPasteManager::ClipboardTextFormat()
 {
-    int result = -1;
-
-    auto dataPackageView = Clipboard::GetContent();
+    const auto dataPackageView = Clipboard::GetContent();

    for (int i = 0; i < RTL_NUMBER_OF(supportedFormats); i++)
    {
        if (dataPackageView->Contains(supportedFormats[i]))
        {
-            result = i;
-            break;
+            return i;
        }
    }
-    return result;
+    return -1;
 }

 String^ CopyPasteManager::ValidatePasteExpression(String^ pastedText, ViewMode mode, int programmerNumberBase, int bitLengthType)
@ -268,13 +266,8 @@ bool CopyPasteManager::ExpressionRegExMatch(vector<wstring> operands, ViewMode m
        return false;
    }

-    bool expMatched = true;
    vector<wregex> patterns{};
-
-    pair<size_t, uint64_t> operandLimits = GetMaxOperandLengthAndValue(mode, modeType, programmerNumberBase, bitLengthType);
-    size_t maxOperandLength = operandLimits.first;
-    uint64_t maxOperandValue = operandLimits.second;
-
+    
    if (mode == ViewMode::Standard)
    {
        patterns.assign(standardModePatterns.begin(), standardModePatterns.end());
@ -292,11 +285,14 @@ bool CopyPasteManager::ExpressionRegExMatch(vector<wstring> operands, ViewMode m
        patterns.assign(unitConverterPatterns.begin(), unitConverterPatterns.end());
    }

-    for (const wstring& operand : operands)
+    const auto [maxOperandLength, maxOperandValue] = GetMaxOperandLengthAndValue(mode, modeType, programmerNumberBase, bitLengthType);
+    bool expMatched = true;
+
+    for (const auto& operand : operands)
    {
        // Each operand only needs to match one of the available patterns.
        bool operandMatched = false;
-        for (const wregex& pattern : patterns)
+        for (const auto& pattern : patterns)
        {
            operandMatched = operandMatched || regex_match(operand, pattern);
        }
@ -305,7 +301,7 @@ bool CopyPasteManager::ExpressionRegExMatch(vector<wstring> operands, ViewMode m
        {
            // Remove characters that are valid in the expression but we do not want to include in length calculations
            // or which will break conversion from string-to-ULL.
-            wstring operandValue = SanitizeOperand(operand);
+            const wstring operandValue = SanitizeOperand(operand);

            // If an operand exceeds the maximum length allowed, break and return.
            if (OperandLength(operandValue, mode, modeType, programmerNumberBase) > maxOperandLength)
@ -341,16 +337,16 @@ bool CopyPasteManager::ExpressionRegExMatch(vector<wstring> operands, ViewMode m

 pair<size_t, uint64_t> CopyPasteManager::GetMaxOperandLengthAndValue(ViewMode mode, CategoryGroupType modeType, int programmerNumberBase, int bitLengthType)
 {
-    size_t maxLength = 0;
-    uint64_t maxValue = 0;
-
+    constexpr size_t defaultMaxOperandLength = 0;
+    constexpr uint64_t defaultMaxValue = 0;
+    
    if (mode == ViewMode::Standard)
    {
-        maxLength = MaxStandardOperandLength;
+        return make_pair(MaxStandardOperandLength, defaultMaxValue);
    }
    else if (mode == ViewMode::Scientific)
    {
-        maxLength = MaxScientificOperandLength;
+        return make_pair(MaxScientificOperandLength, defaultMaxValue);
    }
    else if (mode == ViewMode::Programmer)
    {
@ -390,15 +386,17 @@ pair<size_t, uint64_t> CopyPasteManager::GetMaxOperandLengthAndValue(ViewMode mo

        unsigned int signBit = (programmerNumberBase == DecBase) ? 1 : 0;

-        maxLength = (size_t)ceil((bitLength - signBit) / bitsPerDigit);
-        maxValue = UINT64_MAX >> (MaxProgrammerBitLength - (bitLength - signBit));
+        const auto maxLength = static_cast<size_t>(ceil((bitLength - signBit) / bitsPerDigit));
+        const uint64_t maxValue = UINT64_MAX >> (MaxProgrammerBitLength - (bitLength - signBit));
+
+        return make_pair(maxLength, maxValue);
    }
    else if (modeType == CategoryGroupType::Converter)
    {
-        maxLength = MaxConverterInputLength;
+        return make_pair(MaxConverterInputLength, defaultMaxValue);
    }

-    return make_pair(maxLength, maxValue);
+    return make_pair(defaultMaxOperandLength, defaultMaxValue);
 }

 wstring CopyPasteManager::SanitizeOperand(const wstring& operand)
@ -417,8 +415,7 @@ bool CopyPasteManager::TryOperandToULL(const wstring& operand, int numberBase, u
        return false;
    }

-    // Default to base10
-    int intBase = 10;
+    int intBase;
    switch (numberBase)
    {
    case HexBase:
@ -430,6 +427,7 @@ bool CopyPasteManager::TryOperandToULL(const wstring& operand, int numberBase, u
    case BinBase:
        intBase = 2;
        break;
+    default:
    case DecBase:
        intBase = 10;
        break;
@ -441,11 +439,11 @@ bool CopyPasteManager::TryOperandToULL(const wstring& operand, int numberBase, u
        result = stoull(operand, &size, intBase);
        return true;
    }
-    catch (invalid_argument)
+    catch (const invalid_argument&)
    {
        // Do nothing
    }
-    catch (out_of_range)
+    catch (const out_of_range&)
    {
        // Do nothing
    }
@ -453,35 +451,28 @@ bool CopyPasteManager::TryOperandToULL(const wstring& operand, int numberBase, u
    return false;
 }

-size_t CopyPasteManager::OperandLength(wstring operand, ViewMode mode, CategoryGroupType modeType, int programmerNumberBase)
-{
-    size_t len = 0;
-    if (mode == ViewMode::Standard || mode == ViewMode::Scientific)
-    {
-        len = StandardScientificOperandLength(operand);
-    }
-    else if (mode == ViewMode::Programmer)
-    {
-        len = ProgrammerOperandLength(operand, programmerNumberBase);
-    }
-    else if (modeType == CategoryGroupType::Converter)
-    {
-        len = operand.length();
+size_t CopyPasteManager::OperandLength(const wstring& operand, ViewMode mode, CategoryGroupType modeType, int programmerNumberBase)
+{      
+    if (modeType == CategoryGroupType::Converter) {
+        return operand.length();
    }

-    return len;
+    switch(mode) {
+        case ViewMode::Standard:
+        case ViewMode::Scientific:
+            return StandardScientificOperandLength(operand);
+
+        case ViewMode::Programmer:
+            return ProgrammerOperandLength(operand, programmerNumberBase);
+
+        default:
+            return 0;
+    }
 }

-size_t CopyPasteManager::StandardScientificOperandLength(wstring operand)
-{
-    bool hasDecimal = false;
-    for (size_t i = 0; i < operand.length(); i++)
-    {
-        if (operand[i] == L'.')
-        {
-            hasDecimal = true;
-        }
-    }
+size_t CopyPasteManager::StandardScientificOperandLength(const wstring& operand)
+{   
+    const bool hasDecimal = operand.find('.') != wstring::npos;

    if (hasDecimal)
    {
@ -503,8 +494,7 @@ size_t CopyPasteManager::StandardScientificOperandLength(wstring operand)

 size_t CopyPasteManager::ProgrammerOperandLength(const wstring& operand, int numberBase)
 {
-    size_t len = operand.length();
-
+   
    vector<wstring> prefixes{};
    vector<wstring> suffixes{};
    switch (numberBase)
@ -525,7 +515,7 @@ size_t CopyPasteManager::ProgrammerOperandLength(const wstring& operand, int num
        break;
    default:
        // No defined prefixes/suffixes
-        break;
+      return 0;
    }

    // UInt suffixes are common across all modes
@ -535,9 +525,11 @@ size_t CopyPasteManager::ProgrammerOperandLength(const wstring& operand, int num
    wstring operandUpper = operand;
    transform(operandUpper.begin(), operandUpper.end(), operandUpper.begin(), towupper);

+    size_t len = operand.length();
+
    // Detect if there is a suffix and subtract its length
    // Check suffixes first to allow e.g. "0b" to result in length 1 (value 0), rather than length 0 (no value).
-    for (const wstring& suffix : suffixes)
+    for (const auto& suffix : suffixes)
    {
        if (len < suffix.length())
        {
@ -552,7 +544,7 @@ size_t CopyPasteManager::ProgrammerOperandLength(const wstring& operand, int num
    }

    // Detect if there is a prefix and subtract its length
-    for (const wstring& prefix : prefixes)
+    for (const auto& prefix : prefixes)
    {
        if (len < prefix.length())
        {
--- a/src/CalcViewModel/Common/CopyPasteManager.h
+++ b/src/CalcViewModel/Common/CopyPasteManager.h
@ -13,15 +13,14 @@ namespace CalculatorUnitTests

 namespace CalculatorApp
 {
-
-#define QwordType 1
-#define DwordType 2
-#define WordType 3
-#define ByteType 4
-#define HexBase 5
-#define DecBase 6
-#define OctBase 7
-#define BinBase 8
+    inline constexpr auto QwordType = 1;
+    inline constexpr auto DwordType = 2;
+    inline constexpr auto WordType = 3;
+    inline constexpr auto ByteType = 4;
+    inline constexpr auto HexBase = 5;
+    inline constexpr auto DecBase = 6;
+    inline constexpr auto OctBase = 7;
+    inline constexpr auto BinBase = 8;

    class CopyPasteManager
    {
@ -55,8 +54,8 @@ namespace CalculatorApp
        static std::pair<size_t, uint64_t> GetMaxOperandLengthAndValue(CalculatorApp::Common::ViewMode mode, CalculatorApp::Common::CategoryGroupType modeType, int programmerNumberBase = -1, int bitLengthType = -1);
        static std::wstring SanitizeOperand(const std::wstring& operand);
        static bool TryOperandToULL(const std::wstring& operand, int numberBase, unsigned long long int& result);
-        static size_t OperandLength(std::wstring operand, CalculatorApp::Common::ViewMode mode, CalculatorApp::Common::CategoryGroupType modeType, int programmerNumberBase = -1);
-        static size_t StandardScientificOperandLength(std::wstring operand);
+        static size_t OperandLength(const std::wstring& operand, CalculatorApp::Common::ViewMode mode, CalculatorApp::Common::CategoryGroupType modeType, int programmerNumberBase = -1);
+        static size_t StandardScientificOperandLength(const std::wstring& operand);
        static size_t ProgrammerOperandLength(const std::wstring& operand, int numberBase);
        static std::wstring RemoveUnwantedCharsFromWstring(const std::wstring& input);

--- a/src/CalcViewModel/Common/DateCalculator.cpp
+++ b/src/CalcViewModel/Common/DateCalculator.cpp
@ -20,13 +20,27 @@ DateCalculationEngine::DateCalculationEngine(_In_ String^ calendarIdentifier)
 // Returns: True if function succeeds to calculate the date else returns False
 bool DateCalculationEngine::AddDuration(_In_ DateTime startDate, _In_ const DateDifference& duration, _Out_ DateTime *endDate)
 {
+    auto currentCalendarSystem = m_calendar->GetCalendarSystem();
+
    try
    {
        m_calendar->SetDateTime(startDate);

        if (duration.year != 0)
        {
+            // The Japanese Era system can have multiple year partitions within the same year.
+            // For example, April 30, 2019 is denoted April 30, Heisei 31; May 1, 2019 is denoted as May 1, Reiwa 1.
+            // The Calendar treats Heisei 31 and Reiwa 1 as separate years, which results in some unexpected behaviors where subtracting a year from Reiwa 1 results in a date in Heisei 31.
+            // To provide the expected result across era boundaries, we first convert the Japanese era system to a Gregorian system, do date math, and then convert back to the Japanese era system.
+            // This works because the Japanese era system maintains the same year/month boundaries and durations as the Gregorian system and is only different in display value.
+            if (currentCalendarSystem == CalendarIdentifiers::Japanese)
+            {
+                m_calendar->ChangeCalendarSystem(CalendarIdentifiers::Gregorian);
+            }
+
            m_calendar->AddYears(duration.year);
+
+            m_calendar->ChangeCalendarSystem(currentCalendarSystem);
        }
        if (duration.month != 0)
        {
@ -41,6 +55,9 @@ bool DateCalculationEngine::AddDuration(_In_ DateTime startDate, _In_ const Date
    }
    catch (Platform::InvalidArgumentException^ ex)
    {
+        // ensure that we revert to the correct calendar system
+        m_calendar->ChangeCalendarSystem(currentCalendarSystem);
+
        // Do nothing
        return false;
    }
@ -52,6 +69,8 @@ bool DateCalculationEngine::AddDuration(_In_ DateTime startDate, _In_ const Date
 // Returns: True if function succeeds to calculate the date else returns False
 bool DateCalculationEngine::SubtractDuration(_In_ DateTime startDate, _In_ const DateDifference& duration, _Out_ DateTime *endDate)
 {
+    auto currentCalendarSystem = m_calendar->GetCalendarSystem();
+
    // For Subtract the Algorithm is different than Add. Here the smaller units are subtracted first
    // and then the larger units.
    try
@ -68,13 +87,28 @@ bool DateCalculationEngine::SubtractDuration(_In_ DateTime startDate, _In_ const
        }
        if (duration.year != 0)
        {
+            // The Japanese Era system can have multiple year partitions within the same year.
+            // For example, April 30, 2019 is denoted April 30, Heisei 31; May 1, 2019 is denoted as May 1, Reiwa 1.
+            // The Calendar treats Heisei 31 and Reiwa 1 as separate years, which results in some unexpected behaviors where subtracting a year from Reiwa 1 results in a date in Heisei 31.
+            // To provide the expected result across era boundaries, we first convert the Japanese era system to a Gregorian system, do date math, and then convert back to the Japanese era system.
+            // This works because the Japanese era system maintains the same year/month boundaries and durations as the Gregorian system and is only different in display value.
+            if (currentCalendarSystem == CalendarIdentifiers::Japanese)
+            {
+                m_calendar->ChangeCalendarSystem(CalendarIdentifiers::Gregorian);
+            }
+
            m_calendar->AddYears(-duration.year);
+
+            m_calendar->ChangeCalendarSystem(currentCalendarSystem);
        }

        *endDate = m_calendar->GetDateTime();
    }
    catch (Platform::InvalidArgumentException^ ex)
    {
+        // ensure that we revert to the correct calendar system
+        m_calendar->ChangeCalendarSystem(currentCalendarSystem);
+
        // Do nothing
        return false;
    }
--- a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h
+++ b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h
@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.

 namespace CalculatorApp
@ -162,7 +162,8 @@ namespace CalculatorApp
            Data_Zebibytes = UnitStart + 162,
            Data_Zetabits = UnitStart + 163,
            Data_Zetabytes = UnitStart + 164,
-            UnitEnd = Data_Zetabytes
+            Area_Pyeong = UnitStart + 165,
+            UnitEnd = Area_Pyeong
        };
    }
 }
--- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
+++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
@ -118,12 +118,19 @@ void UnitConverterDataLoader::LoadData()
                unordered_map<int, double> unitConversions = categoryToUnitConversionDataMap.at(categoryViewMode);
                double unitFactor = unitConversions[unit.id];

-                for (auto itr = unitConversions.begin(); itr != unitConversions.end(); ++itr)
+                 for (const auto&[id, conversionFactor] : unitConversions)
                {
+                    if (idToUnit.find(id) == idToUnit.end())
+                    {
+                        // Optional units will not be in idToUnit but can be in unitConversions.
+                        // For optional units that did not make it to the current set of units, just continue.
+                        continue;
+                    }
+
                    UCM::ConversionData parsedData = { 1.0, 0.0, false };
-                    assert(itr->second > 0); // divide by zero assert
-                    parsedData.ratio = unitFactor / itr->second;
-                    conversions.insert(pair<UCM::Unit, UCM::ConversionData>(idToUnit.at(itr->first), parsedData));
+                    assert(conversionFactor > 0); // divide by zero assert
+                    parsedData.ratio = unitFactor / conversionFactor;
+                    conversions.insert(pair<UCM::Unit, UCM::ConversionData>(idToUnit.at(id), parsedData));
                }
            }
            else
@ -175,6 +182,10 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order

    bool useWattInsteadOfKilowatt = m_currentRegionCode == "GB";

+    // Use Pyeong, a Korean floorspace unit.
+    // https://en.wikipedia.org/wiki/Korean_units_of_measurement#Area
+    bool usePyeong = m_currentRegionCode == L"KP" || m_currentRegionCode == L"KR";
+    
    vector<OrderedUnit> areaUnits;
    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Acre, GetLocalizedStringName(L"UnitName_Acre"), GetLocalizedStringName(L"UnitAbbreviation_Acre"), 9 });
    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Hectare, GetLocalizedStringName(L"UnitName_Hectare"), GetLocalizedStringName(L"UnitAbbreviation_Hectare"), 4 });
@ -190,6 +201,10 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order
    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Paper, GetLocalizedStringName(L"UnitName_Paper"), GetLocalizedStringName(L"UnitAbbreviation_Paper"), 12, false, false, true });
    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SoccerField, GetLocalizedStringName(L"UnitName_SoccerField"), GetLocalizedStringName(L"UnitAbbreviation_SoccerField"),13, false, false, true });
    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Castle, GetLocalizedStringName(L"UnitName_Castle"), GetLocalizedStringName(L"UnitAbbreviation_Castle"), 14, false, false, true });
+    if (usePyeong)
+    {
+        areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Pyeong, GetLocalizedStringName(L"UnitName_Pyeong"), GetLocalizedStringName(L"UnitAbbreviation_Pyeong"), 15, false, false, false });
+    }
    unitMap.emplace(ViewMode::Area, areaUnits);

    vector<OrderedUnit> dataUnits;
@ -384,6 +399,7 @@ void UnitConverterDataLoader::GetConversionData(_In_ unordered_map<ViewMode, uno
            { ViewMode::Area, UnitConverterUnits::Area_Paper, 0.06032246 },
            { ViewMode::Area, UnitConverterUnits::Area_SoccerField, 10869.66 },
            { ViewMode::Area, UnitConverterUnits::Area_Castle, 100000 },
+            { ViewMode::Area, UnitConverterUnits::Area_Pyeong, 400.0 / 121.0 },

            { ViewMode::Data, UnitConverterUnits::Data_Bit, 0.000000125 },
            { ViewMode::Data, UnitConverterUnits::Data_Byte, 0.000001 },
--- a/src/CalcViewModel/StandardCalculatorViewModel.cpp
+++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp
@ -48,7 +48,6 @@ namespace CalculatorResourceKeys
    StringReference DecButton(L"Format_DecButtonValue");
    StringReference OctButton(L"Format_OctButtonValue");
    StringReference BinButton(L"Format_BinButtonValue");
-    StringReference LeftParenthesisAutomationFormat(L"Format_OpenParenthesisAutomationNamePrefix");
    StringReference OpenParenthesisCountAutomationFormat(L"Format_OpenParenthesisCountAutomationNamePrefix");
    StringReference NoParenthesisAdded(L"NoRightParenthesisAdded_Announcement");
    StringReference MaxDigitsReachedFormat(L"Format_MaxDigitsReached");
@ -67,6 +66,7 @@ StandardCalculatorViewModel::StandardCalculatorViewModel() :
    m_BinaryDisplayValue(L"0"),
    m_OctalDisplayValue(L"0"),
    m_standardCalculatorManager(&m_calculatorDisplay, &m_resourceProvider),
+    m_ExpressionTokens(ref new Vector<DisplayExpressionToken^>()),
    m_MemorizedNumbers(ref new Vector<MemoryItemViewModel^>()),
    m_IsMemoryEmpty(true),
    m_IsFToEChecked(false),
@ -80,8 +80,8 @@ StandardCalculatorViewModel::StandardCalculatorViewModel() :
    m_isBinaryBitFlippingEnabled(false),
    m_CurrentRadixType(RADIX_TYPE::DEC_RADIX),
    m_CurrentAngleType(NumbersAndOperatorsEnum::Degree),
-    m_OpenParenthesisCount(L""),
    m_Announcement(nullptr),
+    m_OpenParenthesisCount(0),
    m_feedbackForButtonPress(nullptr),
    m_isRtlLanguage(false),
    m_localizedMaxDigitsReachedAutomationFormat(nullptr),
@ -102,7 +102,6 @@ StandardCalculatorViewModel::StandardCalculatorViewModel() :
    m_localizedDecimalAutomationFormat = AppResourceProvider::GetInstance().GetResourceString(CalculatorResourceKeys::DecButton);
    m_localizedOctalAutomationFormat = AppResourceProvider::GetInstance().GetResourceString(CalculatorResourceKeys::OctButton);
    m_localizedBinaryAutomationFormat = AppResourceProvider::GetInstance().GetResourceString(CalculatorResourceKeys::BinButton);
-    m_leftParenthesisAutomationFormat = AppResourceProvider::GetInstance().GetResourceString(CalculatorResourceKeys::LeftParenthesisAutomationFormat);

    // Initialize the Automation Name
    CalculationResultAutomationName = GetLocalizedStringFormat(m_localizedCalculationResultAutomationFormat, m_DisplayValue);
@ -216,19 +215,23 @@ void StandardCalculatorViewModel::DisplayPasteError()
    m_standardCalculatorManager.DisplayPasteError();
 }

-void StandardCalculatorViewModel::SetParenthesisCount(_In_ const wstring& parenthesisCount)
+void StandardCalculatorViewModel::SetParenthesisCount(_In_ unsigned int parenthesisCount)
 {
+    if (m_OpenParenthesisCount == parenthesisCount)
+    {
+        return;
+    }
+
+    OpenParenthesisCount = parenthesisCount;
    if (IsProgrammer || IsScientific)
    {
-        OpenParenthesisCount = ref new String(parenthesisCount.c_str());
-        RaisePropertyChanged("LeftParenthesisAutomationName");
+        SetOpenParenthesisCountNarratorAnnouncement();
    }
 }

 void StandardCalculatorViewModel::SetOpenParenthesisCountNarratorAnnouncement()
 {
-    String^ parenthesisCount = ((m_OpenParenthesisCount == nullptr) ? "0" : m_OpenParenthesisCount);
-    wstring localizedParenthesisCount = parenthesisCount->Data();
+    wstring localizedParenthesisCount = to_wstring(m_OpenParenthesisCount).c_str();
    LocalizationSettings::GetInstance().LocalizeDisplayValue(&localizedParenthesisCount);

    String^ announcement = LocalizationStringUtil::GetLocalizedNarratorAnnouncement(
@ -281,15 +284,6 @@ void StandardCalculatorViewModel::DisableButtons(CommandType selectedExpressionC
    }
 }

-String ^ StandardCalculatorViewModel::GetLeftParenthesisAutomationName()
-{
-    String^ parenthesisCount = ((m_OpenParenthesisCount == nullptr) ? "0" : m_OpenParenthesisCount);
-    wstring localizedParenthesisCount = std::wstring(parenthesisCount->Data());
-    LocalizationSettings::GetInstance().LocalizeDisplayValue(&localizedParenthesisCount);
-
-    return GetLocalizedStringFormat(m_leftParenthesisAutomationFormat, ref new String(localizedParenthesisCount.c_str()));
-}
-
 void StandardCalculatorViewModel::SetExpressionDisplay(_Inout_ shared_ptr<CalculatorVector<pair<wstring, int>>> const &tokens, _Inout_ shared_ptr<CalculatorVector <shared_ptr<IExpressionCommand>>> const &commands)
 {
    m_tokens = tokens;
@ -321,59 +315,67 @@ void StandardCalculatorViewModel::SetTokens(_Inout_ shared_ptr<CalculatorVector<
 {
    AreTokensUpdated = false;

-    if (m_ExpressionTokens == nullptr)
-    {
-        m_ExpressionTokens = ref new Vector<DisplayExpressionToken^>();
-    }
-    else
-    {
-        m_ExpressionTokens->Clear();
-    }
-
    unsigned int nTokens = 0;
    tokens->GetSize(&nTokens);
+
+    if (nTokens == 0)
+    {
+        m_ExpressionTokens->Clear();
+        return;
+    }
+
    pair <wstring, int> currentToken;
    const auto& localizer = LocalizationSettings::GetInstance();

+    const wstring separator = L" ";
    for (unsigned int i = 0; i < nTokens; ++i)
    {
        if (SUCCEEDED(tokens->GetAt(i, &currentToken)))
        {
            Common::TokenType type;
-            const wstring separator = L" ";
            bool isEditable = (currentToken.second == -1) ? false : true;
            localizer.LocalizeDisplayValue(&(currentToken.first));

            if (!isEditable)
            {
-                if (currentToken.first == separator)
-                {
-                    type = TokenType::Separator;
-                }
-                else
-                {
-                    type = TokenType::Operator;
-                }
+                type = currentToken.first == separator ? TokenType::Separator : TokenType::Operator;
            }
-
            else
            {
                shared_ptr<IExpressionCommand> command;
                IFTPlatformException(m_commands->GetAt(static_cast<unsigned int>(currentToken.second), &command));
+                type = command->GetCommandType() == CommandType::OperandCommand ? TokenType::Operand : TokenType::Operator;
+            }

-                if (command->GetCommandType() == CommandType::OperandCommand)
+            auto currentTokenString = ref new String(currentToken.first.c_str());
+            if (i < m_ExpressionTokens->Size)
+            {
+                auto existingItem = m_ExpressionTokens->GetAt(i);
+                if (type == existingItem->Type && existingItem->Token->Equals(currentTokenString))
                {
-                    type = TokenType::Operand;
+                    existingItem->TokenPosition = i;
+                    existingItem->IsTokenEditable = isEditable;
+                    existingItem->CommandIndex = 0;
                }
                else
                {
-                    type = TokenType::Operator;
+                    auto expressionToken = ref new DisplayExpressionToken(currentTokenString, i, isEditable, type);
+                    m_ExpressionTokens->InsertAt(i, expressionToken);
                }
+                
+            }
+            else
+            {
+                auto expressionToken = ref new DisplayExpressionToken(currentTokenString, i, isEditable, type);
+                m_ExpressionTokens->Append(expressionToken);
            }
-            DisplayExpressionToken^ expressionToken = ref new DisplayExpressionToken(ref new String(currentToken.first.c_str()), i, isEditable, type);
-            m_ExpressionTokens->Append(expressionToken);
        }
    }
+
+    while (m_ExpressionTokens->Size != nTokens)
+    {
+        m_ExpressionTokens->RemoveAtEnd();
+    }
 }

 String^ StandardCalculatorViewModel::GetCalculatorExpressionAutomationName()
@ -531,7 +533,7 @@ void StandardCalculatorViewModel::HandleUpdatedOperandData(Command cmdenum)
        {
            if (commandIndex == 0)
            {
-                delete [] temp;
+                delete[] temp;
                return;
            }

@ -552,7 +554,7 @@ void StandardCalculatorViewModel::HandleUpdatedOperandData(Command cmdenum)
            length = m_selectedExpressionLastData->Length() + 1;
            if (length > 50)
            {
-                delete [] temp;
+                delete[] temp;
                return;
            }
            for (; i < length; ++i)
@ -1422,29 +1424,29 @@ void StandardCalculatorViewModel::SaveEditedCommand(_In_ unsigned int tokenPosit

        switch (nOpCode)
        {
-        case static_cast<int>(Command::CommandASIN) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandSIN), true, angleType);
-            break;
-        case static_cast<int>(Command::CommandACOS) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandCOS), true, angleType);
-            break;
-        case static_cast<int>(Command::CommandATAN) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandTAN), true, angleType);
-            break;
-        case static_cast<int>(Command::CommandASINH) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandSINH), true, angleType);
-            break;
-        case static_cast<int>(Command::CommandACOSH) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandCOSH), true, angleType);
-            break;
-        case static_cast<int>(Command::CommandATANH) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandTANH), true, angleType);
-            break;
-        case static_cast<int>(Command::CommandPOWE) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandLN), true, angleType);
-            break;
-        default:
-            updatedToken = CCalcEngine::OpCodeToUnaryString(nOpCode, false, angleType);
+            case static_cast<int>(Command::CommandASIN) :
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandSIN), true, angleType);
+                break;
+            case static_cast<int>(Command::CommandACOS) :
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandCOS), true, angleType);
+                break;
+            case static_cast<int>(Command::CommandATAN) :
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandTAN), true, angleType);
+                break;
+            case static_cast<int>(Command::CommandASINH) :
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandSINH), true, angleType);
+                break;
+            case static_cast<int>(Command::CommandACOSH) :
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandCOSH), true, angleType);
+                break;
+            case static_cast<int>(Command::CommandATANH) :
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandTANH), true, angleType);
+                break;
+            case static_cast<int>(Command::CommandPOWE) :
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandLN), true, angleType);
+                break;
+            default:
+                updatedToken = CCalcEngine::OpCodeToUnaryString(nOpCode, false, angleType);
        }
        if ((token.first.length() > 0) && (token.first[token.first.length() - 1] == L'('))
        {
--- a/src/CalcViewModel/StandardCalculatorViewModel.h
+++ b/src/CalcViewModel/StandardCalculatorViewModel.h
@ -48,7 +48,7 @@ namespace CalculatorApp
            OBSERVABLE_NAMED_PROPERTY_RW(bool, IsInError);
            OBSERVABLE_PROPERTY_RW(bool, IsOperatorCommand);
            OBSERVABLE_PROPERTY_RW(Platform::String^, DisplayStringExpression);
-            OBSERVABLE_PROPERTY_RW(Windows::Foundation::Collections::IVector<Common::DisplayExpressionToken^>^, ExpressionTokens);
+            OBSERVABLE_PROPERTY_R(Windows::Foundation::Collections::IObservableVector<Common::DisplayExpressionToken^>^, ExpressionTokens);
            OBSERVABLE_PROPERTY_RW(Platform::String^, DecimalDisplayValue);
            OBSERVABLE_PROPERTY_RW(Platform::String^, HexDisplayValue);
            OBSERVABLE_PROPERTY_RW(Platform::String^, OctalDisplayValue);
@ -75,18 +75,17 @@ namespace CalculatorApp
            OBSERVABLE_PROPERTY_RW(bool, IsDwordEnabled);
            OBSERVABLE_PROPERTY_RW(bool, IsWordEnabled);
            OBSERVABLE_PROPERTY_RW(bool, IsByteEnabled);
-            OBSERVABLE_NAMED_PROPERTY_RW(Platform::String^, OpenParenthesisCount);
            OBSERVABLE_PROPERTY_RW(int, CurrentRadixType);
            OBSERVABLE_PROPERTY_RW(bool, AreTokensUpdated);
            OBSERVABLE_PROPERTY_RW(bool, AreHistoryShortcutsEnabled);
            OBSERVABLE_PROPERTY_RW(bool, AreProgrammerRadixOperatorsEnabled);
            OBSERVABLE_PROPERTY_RW(CalculatorApp::Common::Automation::NarratorAnnouncement^, Announcement);
+            OBSERVABLE_PROPERTY_R(unsigned int, OpenParenthesisCount);

            COMMAND_FOR_METHOD(CopyCommand, StandardCalculatorViewModel::OnCopyCommand);
            COMMAND_FOR_METHOD(PasteCommand, StandardCalculatorViewModel::OnPasteCommand);
            COMMAND_FOR_METHOD(ButtonPressed, StandardCalculatorViewModel::OnButtonPressed);
            COMMAND_FOR_METHOD(ClearMemoryCommand, StandardCalculatorViewModel::OnClearMemoryCommand);
-            COMMAND_FOR_METHOD(PinUnpinAppBarButtonOnClicked, StandardCalculatorViewModel::OnPinUnpinCommand);
            COMMAND_FOR_METHOD(MemoryItemPressed, StandardCalculatorViewModel::OnMemoryItemPressed);
            COMMAND_FOR_METHOD(MemoryAdd, StandardCalculatorViewModel::OnMemoryAdd);
            COMMAND_FOR_METHOD(MemorySubtract, StandardCalculatorViewModel::OnMemorySubtract);
@ -255,14 +254,6 @@ namespace CalculatorApp
                void set(bool value) { m_completeTextSelection = value; }
            }

-            property Platform::String^ LeftParenthesisAutomationName
-            {
-                Platform::String^ get()
-                {
-                    return GetLeftParenthesisAutomationName();
-                }
-            }
-
        internal:
            void OnPaste(Platform::String^ pastedString, CalculatorApp::Common::ViewMode mode);
            void OnCopyCommand(Platform::Object^ parameter);
@ -283,7 +274,7 @@ namespace CalculatorApp
            void SetTokens(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens);
            void SetExpressionDisplay(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens, _Inout_ std::shared_ptr<CalculatorVector<std::shared_ptr<IExpressionCommand>>> const &commands);
            void SetHistoryExpressionDisplay(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens, _Inout_ std::shared_ptr<CalculatorVector <std::shared_ptr<IExpressionCommand>>> const &commands);
-            void SetParenthesisCount(_In_ const std::wstring& parenthesisCount);
+            void SetParenthesisCount(_In_ unsigned int parenthesisCount);
            void SetOpenParenthesisCountNarratorAnnouncement();
            void OnNoRightParenAdded();
            void SetNoParenAddedNarratorAnnouncement();
@ -354,7 +345,6 @@ namespace CalculatorApp
            bool m_isLastOperationHistoryLoad;
            Platform::String^ m_selectedExpressionLastData;
            Common::DisplayExpressionToken^ m_selectedExpressionToken;
-            Platform::String^ m_leftParenthesisAutomationFormat;

            Platform::String^ LocalizeDisplayValue(_In_ std::wstring const &displayValue, _In_ bool isError);
            Platform::String^ CalculateNarratorDisplayValue(_In_ std::wstring const &displayValue, _In_ Platform::String^ localizedDisplayValue, _In_ bool isError);
@ -364,7 +354,6 @@ namespace CalculatorApp

            CalculationManager::Command ConvertToOperatorsEnum(NumbersAndOperatorsEnum operation);
            void DisableButtons(CalculationManager::CommandType selectedExpressionCommandType);
-            Platform::String^ GetLeftParenthesisAutomationName();

            Platform::String^ m_feedbackForButtonPress;
            void OnButtonPressed(Platform::Object^ parameter);
--- a/src/CalcViewModel/UnitConverterViewModel.cpp
+++ b/src/CalcViewModel/UnitConverterViewModel.cpp
@ -165,12 +165,16 @@ void UnitConverterViewModel::PopulateData()
 }

 void UnitConverterViewModel::OnCategoryChanged(Object^ parameter)
+{
+    m_model->SendCommand(UCM::Command::Clear);
+    ResetCategory();
+}
+
+void UnitConverterViewModel::ResetCategory()
 {
    UCM::Category currentCategory = CurrentCategory->GetModelCategory();
    IsCurrencyCurrentCategory = currentCategory.id == NavCategory::Serialize(ViewMode::Currency);

-    m_model->SendCommand(UCM::Command::Clear);
-
    m_isInputBlocked = false;
    SetSelectedUnits();

@ -706,7 +710,9 @@ void UnitConverterViewModel::OnCurrencyDataLoadFinished(bool didLoad)
 {
    m_isCurrencyDataLoaded = true;
    CurrencyDataLoadFailed = !didLoad;
-    ResetView();
+    m_model->ResetCategoriesAndRatios();
+    m_model->Calculate();
+    ResetCategory();

    StringReference key = didLoad ? UnitConverterResourceKeys::CurrencyRatesUpdated : UnitConverterResourceKeys::CurrencyRatesUpdateFailed;
    String^ announcement = AppResourceProvider::GetInstance().GetResourceString(key);
--- a/src/CalcViewModel/UnitConverterViewModel.h
+++ b/src/CalcViewModel/UnitConverterViewModel.h
@ -223,6 +223,7 @@ namespace CalculatorApp
            void UpdateValue2AutomationName();
            Platform::String^ Serialize();
            void Deserialize(Platform::String^ state);
+            void ResetCategoriesAndRatio();

            // Saving And Restoring User Preferences of Category and Associated-Units across Sessions.
            void SaveUserPreferences();
@ -263,6 +264,7 @@ namespace CalculatorApp
            void RefreshSupplementaryResults();
            void UpdateInputBlocked(_In_ const std::wstring& currencyInput);
            bool UnitsAreValid();
+            void ResetCategory();

            void OnButtonPressed(Platform::Object^ parameter);
            Platform::String^ ConvertToLocalizedString(const std::wstring& stringToLocalize, bool allowPartialStrings);
--- a/src/Calculator.sln
+++ b/src/Calculator.sln
@ -16,6 +16,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalcViewModel", "CalcViewMo
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalculatorUnitTests", "CalculatorUnitTests\CalculatorUnitTests.vcxproj", "{D3BAED2C-4B07-4E1D-8807-9D6499450349}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CalculatorUITests", "CalculatorUITests\CalculatorUITests.csproj", "{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@ -28,22 +30,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.ActiveCfg = Debug|ARM
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.Build.0 = Debug|ARM
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM64.Build.0 = Debug|ARM64
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x64.ActiveCfg = Debug|x64
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x64.Build.0 = Debug|x64
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x86.ActiveCfg = Debug|Win32
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x86.Build.0 = Debug|Win32
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM.ActiveCfg = Release|ARM
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM.Build.0 = Release|ARM
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM64.ActiveCfg = Release|ARM64
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM64.Build.0 = Release|ARM64
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|x64.ActiveCfg = Release|x64
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|x64.Build.0 = Release|x64
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|x86.ActiveCfg = Release|Win32
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|x86.Build.0 = Release|Win32
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Debug|ARM.ActiveCfg = Debug|ARM
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Debug|ARM.Build.0 = Debug|ARM
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Debug|ARM.Deploy.0 = Debug|ARM
@ -68,6 +54,22 @@ Global
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Release|x86.ActiveCfg = Release|Win32
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Release|x86.Build.0 = Release|Win32
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Release|x86.Deploy.0 = Release|Win32
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.ActiveCfg = Debug|ARM
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.Build.0 = Debug|ARM
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM64.Build.0 = Debug|ARM64
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x64.ActiveCfg = Debug|x64
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x64.Build.0 = Debug|x64
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x86.ActiveCfg = Debug|Win32
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x86.Build.0 = Debug|Win32
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM.ActiveCfg = Release|ARM
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM.Build.0 = Release|ARM
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM64.ActiveCfg = Release|ARM64
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM64.Build.0 = Release|ARM64
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|x64.ActiveCfg = Release|x64
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|x64.Build.0 = Release|x64
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|x86.ActiveCfg = Release|Win32
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|x86.Build.0 = Release|Win32
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Debug|ARM.ActiveCfg = Debug|ARM
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Debug|ARM.Build.0 = Debug|ARM
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Debug|ARM64.ActiveCfg = Debug|ARM64
@ -100,6 +102,22 @@ Global
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Release|x86.ActiveCfg = Release|Win32
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Release|x86.Build.0 = Release|Win32
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Release|x86.Deploy.0 = Release|Win32
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|x64.Build.0 = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|x86.Build.0 = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|ARM.Build.0 = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|ARM64.Build.0 = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|x64.ActiveCfg = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|x64.Build.0 = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@ -19,7 +19,6 @@
                    <Color x:Key="ChromeMediumLowColor">#FF2B2B2B</Color>
                    <SolidColorBrush x:Key="SystemControlBackgroundAltHighBrush" Color="{StaticResource AltHighColor}"/>
                    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumLowBrush" Color="{StaticResource ChromeMediumLowColor}"/>
-                    <SolidColorBrush x:Key="TitleBarBackgroundTransparentBrush" Color="Transparent"/>
                    <SolidColorBrush x:Key="TitleBarForegroundBaseHighBrush" Color="{StaticResource SystemBaseHighColor}"/>
                    <SolidColorBrush x:Key="SystemControlBackgroundTransparentBrush" Color="Transparent"/>
                    <SolidColorBrush x:Key="SystemControlHighlightTransparentBrush" Color="Transparent"/>
@ -55,7 +54,6 @@
                    <Color x:Key="ChromeMediumLowColor">#FFE0E0E0</Color>
                    <SolidColorBrush x:Key="SystemControlBackgroundAltHighBrush" Color="{StaticResource SystemAltHighColor}"/>
                    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumLowBrush" Color="{StaticResource ChromeMediumLowColor}"/>
-                    <SolidColorBrush x:Key="TitleBarBackgroundTransparentBrush" Color="Transparent"/>
                    <SolidColorBrush x:Key="TitleBarForegroundBaseHighBrush" Color="{StaticResource SystemBaseHighColor}"/>
                    <SolidColorBrush x:Key="SystemControlBackgroundTransparentBrush" Color="Transparent"/>
                    <SolidColorBrush x:Key="SystemControlHighlightTransparentBrush" Color="Transparent"/>
@ -89,7 +87,6 @@
                    <x:Double x:Key="HighContrastStrokeThickness">2</x:Double>
                    <SolidColorBrush x:Key="SystemControlBackgroundAltHighBrush" Color="{ThemeResource SystemColorButtonFaceColor}"/>
                    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumLowBrush" Color="{ThemeResource SystemColorButtonFaceColor}"/>
-                    <SolidColorBrush x:Key="TitleBarBackgroundTransparentBrush" Color="{ThemeResource SystemColorActiveCaptionColor}"/>
                    <SolidColorBrush x:Key="TitleBarForegroundBaseHighBrush" Color="{ThemeResource SystemColorCaptionTextColor}"/>
                    <SolidColorBrush x:Key="SystemControlBackgroundTransparentBrush" Color="{ThemeResource SystemColorButtonFaceColor}"/>
                    <SolidColorBrush x:Key="SystemControlHighlightTransparentBrush" Color="{ThemeResource SystemColorHighlightColor}"/>
@ -356,7 +353,8 @@
                <Setter Property="ZoomMode" Value="Disabled"/>
            </Style>

-            <Style x:Key="CalculationResultStyle" TargetType="Controls:CalculationResult">
+            <Style x:Key="CalculationResultStyle"
+                   TargetType="Controls:CalculationResult">
                <Setter Property="Background" Value="Transparent"/>
                <Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
                <Setter Property="HorizontalAlignment" Value="Stretch"/>
@ -368,7 +366,7 @@
                <Setter Property="Template">
                    <Setter.Value>
                        <ControlTemplate TargetType="Controls:CalculationResult">
-                            <Grid x:Name="border" Background="{TemplateBinding Background}">
+                            <Grid x:Name="Border" Background="{TemplateBinding Background}">
                                <Grid.ColumnDefinitions>
                                    <ColumnDefinition Width="12"/>
                                    <ColumnDefinition/>
@ -378,19 +376,19 @@
                                    <VisualStateGroup x:Name="ActiveStates">
                                        <VisualState x:Name="Active">
                                            <VisualState.Setters>
-                                                <Setter Target="normalOutput.FontWeight" Value="SemiBold"/>
-                                                <Setter Target="normalOutput.IsTextSelectionEnabled" Value="True"/>
+                                                <Setter Target="NormalOutput.FontWeight" Value="SemiBold"/>
+                                                <Setter Target="NormalOutput.IsTextSelectionEnabled" Value="True"/>
                                            </VisualState.Setters>
                                        </VisualState>
                                        <VisualState x:Name="Normal"/>
                                    </VisualStateGroup>
                                </VisualStateManager.VisualStateGroups>
-                                <ScrollViewer x:Name="textContainer"
+                                <ScrollViewer x:Name="TextContainer"
                                              Grid.Column="1"
                                              Padding="0,0,0,0"
                                              Style="{ThemeResource ResultsScrollerSnapped}"
                                              AutomationProperties.AccessibilityView="Raw">
-                                    <TextBlock x:Name="normalOutput"
+                                    <TextBlock x:Name="NormalOutput"
                                               Margin="{TemplateBinding DisplayMargin}"
                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@ -402,7 +400,7 @@
                                               TextAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               TextWrapping="NoWrap"/>
                                </ScrollViewer>
-                                <HyperlinkButton x:Name="scrollLeft"
+                                <HyperlinkButton x:Name="ScrollLeft"
                                                 Grid.Column="0"
                                                 Width="20"
                                                 MinWidth="20"
@ -415,12 +413,12 @@
                                                 Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
                                                 BorderThickness="0"
                                                 Visibility="Collapsed">
-                                    <FontIcon x:Name="scrollLeftText"
+                                    <FontIcon x:Name="ScrollLeftText"
                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                              FontSize="12"
                                              Glyph="&#xE26C;"/>
                                </HyperlinkButton>
-                                <HyperlinkButton x:Name="scrollRight"
+                                <HyperlinkButton x:Name="ScrollRight"
                                                 Grid.Column="2"
                                                 Width="20"
                                                 MinWidth="20"
@ -433,7 +431,7 @@
                                                 Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
                                                 BorderThickness="0"
                                                 Visibility="Collapsed">
-                                    <FontIcon x:Name="scrollRightText"
+                                    <FontIcon x:Name="ScrollRightText"
                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                              FontSize="12"
                                              Glyph="&#xE26B;"/>
--- a/src/Calculator/App.xaml.cpp
+++ b/src/Calculator/App.xaml.cpp
@ -233,12 +233,14 @@ void App::OnAppLaunch(IActivatedEventArgs^ args, String^ argument)

    TraceLogger::GetInstance().LogOnAppLaunch(previousExecutionState.ToString()->Data());

-#if _DEBUG
-    if (IsDebuggerPresent())
-    {
-        DebugSettings->EnableFrameRateCounter = true;
-    }
-#endif
+    // Uncomment the following lines to display frame-rate and per-frame CPU usage info.
+    //#if _DEBUG
+    //    if (IsDebuggerPresent())
+    //    {
+    //        DebugSettings->EnableFrameRateCounter = true;
+    //    }
+    //#endif
+
    auto userSettings = ref new Windows::UI::ViewManagement::UISettings();
    m_isAnimationEnabled = userSettings->AnimationsEnabled;

--- a/src/Calculator/Calculator.vcxproj
+++ b/src/Calculator/Calculator.vcxproj
@ -234,19 +234,15 @@
    <ClInclude Include="Controls\OverflowTextBlockAutomationPeer.h" />
    <ClInclude Include="Common\AlwaysSelectedCollectionView.h" />
    <ClInclude Include="Common\BindableBase.h" />
-    <ClInclude Include="Controls\AppBar.h" />
    <ClInclude Include="Controls\CalculationResult.h" />
    <ClInclude Include="Controls\CalculatorButton.h" />
    <ClInclude Include="Controls\FlipButtons.h" />
-    <ClInclude Include="Controls\OperandTextBox.h" />
-    <ClInclude Include="Controls\OperatorTextBox.h" />
    <ClInclude Include="Controls\OverflowTextBlock.h" />
    <ClInclude Include="Controls\RadixButton.h" />
    <ClInclude Include="Controls\SupplementaryItemsControl.h" />
    <ClInclude Include="Converters\BitFlipAutomationNameConverter.h" />
    <ClInclude Include="Converters\BooleanNegationConverter.h" />
    <ClInclude Include="Converters\BooleanToVisibilityConverter.h" />
-    <ClInclude Include="Converters\ExpressionItemContainerStyle.h" />
    <ClInclude Include="Converters\ExpressionItemTemplateSelector.h" />
    <ClInclude Include="Converters\ItemSizeToVisibilityConverter.h" />
    <ClInclude Include="Converters\RadixToStringConverter.h" />
@ -256,7 +252,6 @@
    <ClInclude Include="App.xaml.h">
      <DependentUpon>App.xaml</DependentUpon>
    </ClInclude>
-    <ClInclude Include="Common\TitleBarHelper.h" />
    <ClInclude Include="Views\Calculator.xaml.h">
      <DependentUpon>Views\Calculator.xaml</DependentUpon>
    </ClInclude>
@ -372,15 +367,12 @@
    <ClCompile Include="Controls\CalculationResult.cpp" />
    <ClCompile Include="Controls\CalculatorButton.cpp" />
    <ClCompile Include="Controls\FlipButtons.cpp" />
-    <ClCompile Include="Controls\OperandTextBox.cpp" />
-    <ClCompile Include="Controls\OperatorTextBox.cpp" />
    <ClCompile Include="Controls\OverflowTextBlock.cpp" />
    <ClCompile Include="Controls\RadixButton.cpp" />
    <ClCompile Include="Controls\SupplementaryItemsControl.cpp" />
    <ClCompile Include="Converters\BitFlipAutomationNameConverter.cpp" />
    <ClCompile Include="Converters\BooleanNegationConverter.cpp" />
    <ClCompile Include="Converters\BooleanToVisibilityConverter.cpp" />
-    <ClCompile Include="Converters\ExpressionItemContainerStyle.cpp" />
    <ClCompile Include="Converters\ExpressionItemTemplateSelector.cpp" />
    <ClCompile Include="Converters\ItemSizeToVisibilityConverter.cpp" />
    <ClCompile Include="Converters\RadixToStringConverter.cpp" />
@ -396,7 +388,6 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
    </ClCompile>
-    <ClCompile Include="Common\TitleBarHelper.cpp" />
    <ClCompile Include="Views\Calculator.xaml.cpp">
      <DependentUpon>Views\Calculator.xaml</DependentUpon>
    </ClCompile>
--- a/src/Calculator/Calculator.vcxproj.filters
+++ b/src/Calculator/Calculator.vcxproj.filters
@ -243,9 +243,6 @@
    <ClCompile Include="Converters\BooleanToVisibilityConverter.cpp">
      <Filter>Converters</Filter>
    </ClCompile>
-    <ClCompile Include="Converters\ExpressionItemContainerStyle.cpp">
-      <Filter>Converters</Filter>
-    </ClCompile>
    <ClCompile Include="Converters\ExpressionItemTemplateSelector.cpp">
      <Filter>Converters</Filter>
    </ClCompile>
@ -271,12 +268,6 @@
    <ClCompile Include="Views\NumberPad.xaml.cpp" />
    <ClCompile Include="Views\SupplementaryResults.xaml.cpp" />
    <ClCompile Include="Views\UnitConverter.xaml.cpp" />
-    <ClCompile Include="Controls\OperandTextBox.cpp">
-      <Filter>Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="Controls\OperatorTextBox.cpp">
-      <Filter>Controls</Filter>
-    </ClCompile>
    <ClCompile Include="Controls\FlipButtons.cpp">
      <Filter>Controls</Filter>
    </ClCompile>
@ -287,9 +278,6 @@
    </ClCompile>
    <ClCompile Include="WindowFrameService.cpp" />
    <ClCompile Include="Views\DateCalculator.xaml.cpp" />
-    <ClCompile Include="Common\TitleBarHelper.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
    <ClCompile Include="Controls\CalculationResultAutomationPeer.cpp">
      <Filter>Controls</Filter>
    </ClCompile>
@ -299,7 +287,6 @@
    <ClCompile Include="Views\StateTriggers\AspectRatioTrigger.cpp">
      <Filter>Views\StateTriggers</Filter>
    </ClCompile>
-    <ClCompile Include="Views\TitleBar.xaml.cpp" />
    <ClCompile Include="Views\MemoryListItem.xaml.cpp" />
    <ClCompile Include="Views\OperatorsPanel.xaml.cpp" />
    <ClCompile Include="Controls\SupplementaryItemsControl.cpp">
@ -311,6 +298,7 @@
    <ClCompile Include="Controls\HorizontalNoOverflowStackPanel.cpp">
      <Filter>Controls</Filter>
    </ClCompile>
+    <ClCompile Include="Views\TitleBar.xaml.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="pch.h" />
@ -321,9 +309,6 @@
    <ClInclude Include="Common\BindableBase.h">
      <Filter>Common</Filter>
    </ClInclude>
-    <ClInclude Include="Controls\AppBar.h">
-      <Filter>Controls</Filter>
-    </ClInclude>
    <ClInclude Include="Controls\CalculationResult.h">
      <Filter>Controls</Filter>
    </ClInclude>
@ -342,9 +327,6 @@
    <ClInclude Include="Converters\BooleanToVisibilityConverter.h">
      <Filter>Converters</Filter>
    </ClInclude>
-    <ClInclude Include="Converters\ExpressionItemContainerStyle.h">
-      <Filter>Converters</Filter>
-    </ClInclude>
    <ClInclude Include="Converters\ExpressionItemTemplateSelector.h">
      <Filter>Converters</Filter>
    </ClInclude>
@ -370,12 +352,6 @@
    <ClInclude Include="Views\NumberPad.xaml.h" />
    <ClInclude Include="Views\SupplementaryResults.xaml.h" />
    <ClInclude Include="Views\UnitConverter.xaml.h" />
-    <ClInclude Include="Controls\OperandTextBox.h">
-      <Filter>Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="Controls\OperatorTextBox.h">
-      <Filter>Controls</Filter>
-    </ClInclude>
    <ClInclude Include="Controls\FlipButtons.h">
      <Filter>Controls</Filter>
    </ClInclude>
@ -389,9 +365,6 @@
    <ClInclude Include="Converters\BitFlipAutomationNameConverter.h">
      <Filter>Converters</Filter>
    </ClInclude>
-    <ClInclude Include="Common\TitleBarHelper.h">
-      <Filter>Common</Filter>
-    </ClInclude>
    <ClInclude Include="Controls\CalculationResultAutomationPeer.h">
      <Filter>Controls</Filter>
    </ClInclude>
@ -401,7 +374,6 @@
    <ClInclude Include="Views\StateTriggers\AspectRatioTrigger.h">
      <Filter>Views\StateTriggers</Filter>
    </ClInclude>
-    <ClInclude Include="Views\TitleBar.xaml.h" />
    <ClInclude Include="Views\MemoryListItem.xaml.h" />
    <ClInclude Include="Views\OperatorsPanel.xaml.h" />
    <ClInclude Include="Controls\SupplementaryItemsControl.h">
@ -413,6 +385,7 @@
    <ClInclude Include="Controls\HorizontalNoOverflowStackPanel.h">
      <Filter>Controls</Filter>
    </ClInclude>
+    <ClInclude Include="Views\TitleBar.xaml.h" />
  </ItemGroup>
  <ItemGroup>
    <AppxManifest Include="Package.appxmanifest" />
@ -471,15 +444,15 @@
    <Page Include="Views\DateCalculator.xaml">
      <Filter>Views</Filter>
    </Page>
-    <Page Include="Views\TitleBar.xaml">
-      <Filter>Views</Filter>
-    </Page>
    <Page Include="Views\MemoryListItem.xaml">
      <Filter>Views</Filter>
    </Page>
    <Page Include="Views\OperatorsPanel.xaml">
      <Filter>Views</Filter>
    </Page>
+    <Page Include="Views\TitleBar.xaml">
+      <Filter>Views</Filter>
+    </Page>
  </ItemGroup>
  <ItemGroup>
    <PRIResource Include="Resources\en-US\CEngineStrings.resw">
--- a/src/Calculator/Common/TitleBarHelper.cpp
+++ b/src/Calculator/Common/TitleBarHelper.cpp
@ -1,94 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#include "pch.h"
-#include "TitleBarHelper.h"
-#include "Converters/BooleanToVisibilityConverter.h"
-#include "CalcViewModel/ViewState.h"
-
-using namespace CalculatorApp::Common;
-using namespace CalculatorApp::Converters;
-using namespace Platform;
-using namespace std;
-using namespace Windows::ApplicationModel::Core;
-using namespace Windows::Foundation;
-using namespace Windows::UI::Xaml;
-
-unique_ptr<TitleBarHelper> TitleBarHelper::CreateTitleBarHelperIfNotDocked(FrameworkElement^ customTitleBar)
-{
-    return (App::GetAppViewState() == ViewState::DockedView)
-        ? nullptr
-        : CalculatorApp::Common::TitleBarHelper::CreateTitleBarHelper(customTitleBar);
-}
-
-unique_ptr<TitleBarHelper> TitleBarHelper::CreateTitleBarHelper(_In_ FrameworkElement^ customTitleBar)
-{
-    assert(customTitleBar != nullptr);
-    if (customTitleBar != nullptr)
-    {
-        CoreApplicationViewTitleBar^ coreTitleBar = CoreApplication::GetCurrentView()->TitleBar;
-        assert(coreTitleBar != nullptr);
-        if (coreTitleBar != nullptr)
-        {
-            return make_unique<TitleBarHelper>(coreTitleBar, customTitleBar);
-        }
-    }
-
-    return nullptr;
-}
-
-TitleBarHelper::TitleBarHelper(_In_ CoreApplicationViewTitleBar^ coreTitleBar, _In_ FrameworkElement^ customTitleBar) :
-    m_coreTitleBar(coreTitleBar),
-    m_customTitleBar(customTitleBar)
-{
-    RegisterForLayoutChanged();
-    RegisterForVisibilityChanged();
-    SetCustomTitleBar();
-}
-
-TitleBarHelper::~TitleBarHelper()
-{
-    m_coreTitleBar->LayoutMetricsChanged -= m_layoutChangedToken;
-    m_coreTitleBar->IsVisibleChanged -= m_visibilityChangedToken;
-}
-
-void TitleBarHelper::SetTitleBarHeight(double height)
-{
-    m_customTitleBar->Height = height;
-}
-
-void TitleBarHelper::SetTitleBarVisibility(bool isVisible)
-{
-    m_customTitleBar->Visibility = BooleanToVisibilityConverter::Convert(isVisible);
-}
-
-void TitleBarHelper::RegisterForLayoutChanged()
-{
-    m_layoutChangedToken =
-        m_coreTitleBar->LayoutMetricsChanged += ref new TypedEventHandler<CoreApplicationViewTitleBar^, Object^>(
-        [this](CoreApplicationViewTitleBar^ cTitleBar, Object^)
-    {
-        // Update title bar control size as needed to account for system size changes
-        SetTitleBarHeight(cTitleBar->Height);
-    });
-}
-
-void TitleBarHelper::RegisterForVisibilityChanged()
-{
-    m_visibilityChangedToken =
-        m_coreTitleBar->IsVisibleChanged += ref new TypedEventHandler<CoreApplicationViewTitleBar^, Object^>(
-        [this](CoreApplicationViewTitleBar^ cTitleBar, Object^)
-    {
-        // Update title bar visibility
-        SetTitleBarVisibility(cTitleBar->IsVisible);
-    });
-}
-
-void TitleBarHelper::SetCustomTitleBar()
-{
-    // Set custom XAML Title Bar
-    m_coreTitleBar->ExtendViewIntoTitleBar = true;
-    SetTitleBarHeight(m_coreTitleBar->Height);
-    SetTitleBarVisibility(m_coreTitleBar->IsVisible);
-    Window::Current->SetTitleBar(m_customTitleBar);
-}
--- a/src/Calculator/Common/TitleBarHelper.h
+++ b/src/Calculator/Common/TitleBarHelper.h
@ -1,40 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#pragma once
-
-namespace CalculatorApp
-{
-    namespace Common
-    {
-        class TitleBarHelper
-        {
-        public:
-            static std::unique_ptr<TitleBarHelper> CreateTitleBarHelperIfNotDocked(
-                _In_ Windows::UI::Xaml::FrameworkElement^ customTitleBar);
-
-            // Prefer CreateTitleBarHelper over constructing your own instance,
-            // because Create* will nullcheck the parameters.
-            static std::unique_ptr<TitleBarHelper> CreateTitleBarHelper(
-                _In_ Windows::UI::Xaml::FrameworkElement^ customTitleBar);
-
-            TitleBarHelper(
-                _In_ Windows::ApplicationModel::Core::CoreApplicationViewTitleBar^ coreTitleBar,
-                _In_ Windows::UI::Xaml::FrameworkElement^ customTitleBar);
-            ~TitleBarHelper();
-
-            void SetTitleBarHeight(double height);
-            void SetTitleBarVisibility(bool isVisible);
-
-        private:
-            void RegisterForLayoutChanged();
-            void RegisterForVisibilityChanged();
-            void SetCustomTitleBar();
-
-            Platform::Agile<Windows::ApplicationModel::Core::CoreApplicationViewTitleBar^> m_coreTitleBar;
-            Windows::UI::Xaml::FrameworkElement^ m_customTitleBar;
-            Windows::Foundation::EventRegistrationToken m_layoutChangedToken;
-            Windows::Foundation::EventRegistrationToken m_visibilityChangedToken;
-        };
-    }
-}
--- a/src/Calculator/Controls/AppBar.h
+++ b/src/Calculator/Controls/AppBar.h
@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include "Common/KeyboardShortcutManager.h"
-
-namespace CalculatorApp
-{
-    namespace Controls
-    {
-        public ref class AppBar sealed : public Windows::UI::Xaml::Controls::AppBar
-        {
-        public:
-            AppBar()
-            {}
-
-        protected:
-            virtual void OnKeyDown(Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e) override
-            {
-                Windows::UI::Xaml::Controls::AppBar::OnKeyDown(e);
-                if (e->Key == Windows::System::VirtualKey::Escape)
-                {
-                    Common::KeyboardShortcutManager::IgnoreEscape(true);
-                }
-            }
-        };
-    }
-}
--- a/src/Calculator/Controls/CalculationResult.cpp
+++ b/src/Calculator/Controls/CalculationResult.cpp
@ -72,7 +72,7 @@ void CalculationResult::OnApplyTemplate()
    {
        m_textContainer->LayoutUpdated -= m_textContainerLayoutChangedToken;
    }
-    m_textContainer = dynamic_cast<ScrollViewer^>(GetTemplateChild("textContainer"));
+    m_textContainer = dynamic_cast<ScrollViewer^>(GetTemplateChild("TextContainer"));
    if (m_textContainer)
    {
        m_textContainer->SizeChanged += ref new SizeChangedEventHandler(this, &CalculationResult::TextContainerSizeChanged);
@ -81,9 +81,9 @@ void CalculationResult::OnApplyTemplate()
        m_textContainerLayoutChangedToken = m_textContainer->LayoutUpdated += ref new EventHandler<Object^>(this, &CalculationResult::OnTextContainerLayoutUpdated);

        m_textContainer->ChangeView(m_textContainer->ExtentWidth - m_textContainer->ViewportWidth,nullptr,nullptr);
-        m_scrollLeft = dynamic_cast<HyperlinkButton^>(GetTemplateChild("scrollLeft"));
-        m_scrollRight = dynamic_cast<HyperlinkButton^>(GetTemplateChild("scrollRight"));
-        auto borderContainer = dynamic_cast<UIElement^>(GetTemplateChild("border"));
+        m_scrollLeft = dynamic_cast<HyperlinkButton^>(GetTemplateChild("ScrollLeft"));
+        m_scrollRight = dynamic_cast<HyperlinkButton^>(GetTemplateChild("ScrollRight"));
+        auto borderContainer = dynamic_cast<UIElement^>(GetTemplateChild("Border"));
        if (m_scrollLeft && m_scrollRight)
        {
            m_scrollLeft->Click += ref new RoutedEventHandler(this, &CalculationResult::OnScrollClick);
@ -91,7 +91,7 @@ void CalculationResult::OnApplyTemplate()
            borderContainer->PointerEntered += ref new PointerEventHandler(this, &CalculationResult::OnPointerEntered);
            borderContainer->PointerExited += ref new PointerEventHandler(this, &CalculationResult::OnPointerExited);
        }
-        m_textBlock = dynamic_cast<TextBlock^>(m_textContainer->FindName("normalOutput"));
+        m_textBlock = dynamic_cast<TextBlock^>(m_textContainer->FindName("NormalOutput"));
        if (m_textBlock)
        {
            m_textBlock->Visibility = ::Visibility::Visible;
--- a/src/Calculator/Controls/OperandTextBox.cpp
+++ b/src/Calculator/Controls/OperandTextBox.cpp
@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#include "pch.h"
-#include "OperandTextBox.h"
-#include "regex"
-
-using namespace CalculatorApp;
-using namespace CalculatorApp::Controls;
-
-using namespace Platform;
-using namespace std;
-using namespace Windows::Foundation;
-using namespace Windows::Foundation::Collections;
-using namespace Windows::Devices::Input;
-using namespace Windows::System;
-using namespace Windows::UI::Xaml;
-using namespace Windows::UI::Xaml::Controls;
-using namespace Windows::UI::Xaml::Controls::Primitives;
-using namespace Windows::UI::Xaml::Data;
-using namespace Windows::UI::Xaml::Input;
-using namespace Windows::UI::Xaml::Media;
-using namespace Windows::UI::Xaml::Navigation;
-
-void OperandTextBox::OnApplyTemplate()
-{
-    this->IsEnabled = false;
-    this->IsHitTestVisible = false;
-    this->IsTapEnabled = false;
-    this->MaxLength = 50;
-    this->IsRightTapEnabled = false;
-    this->IsTabStop = false;
-    auto parent = VisualTreeHelper::GetParent(this);
-    ListViewItem^ listViewItem;
-    ListView^ listView;
-    while (parent != nullptr)
-    {
-        if (listViewItem == nullptr)
-        {
-            listViewItem = dynamic_cast<ListViewItem^>(parent);
-        }
-
-        listView = dynamic_cast<ListView^>(parent);
-        if (listView != nullptr)
-        {
-            break;
-        }
-        parent = VisualTreeHelper::GetParent(parent);
-    }
-
-    if (listView != nullptr)
-    {
-        listViewItem->IsEnabled = false;
-        listViewItem->IsHitTestVisible = false;
-        listViewItem->IsTapEnabled = false;
-    }
-    TextBox::OnApplyTemplate();
-}
--- a/src/Calculator/Controls/OperandTextBox.h
+++ b/src/Calculator/Controls/OperandTextBox.h
@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#pragma once
-
-namespace CalculatorApp
-{
-    namespace Controls
-    {
-        public ref class OperandTextBox sealed : public Windows::UI::Xaml::Controls::TextBox
-        {
-        public:
-            OperandTextBox() { }
-
-        protected:
-            virtual void OnApplyTemplate() override;
-        };
-    }
-}
--- a/src/Calculator/Controls/OperatorTextBox.cpp
+++ b/src/Calculator/Controls/OperatorTextBox.cpp
@ -1,59 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#include "pch.h"
-#include "OperatorTextBox.h"
-#include "regex"
-
-using namespace CalculatorApp;
-using namespace CalculatorApp::Controls;
-
-using namespace Platform;
-using namespace std;
-using namespace Windows::Foundation;
-using namespace Windows::Foundation::Collections;
-using namespace Windows::Devices::Input;
-using namespace Windows::System;
-using namespace Windows::UI::Xaml;
-using namespace Windows::UI::Xaml::Controls;
-using namespace Windows::UI::Xaml::Controls::Primitives;
-using namespace Windows::UI::Xaml::Data;
-using namespace Windows::UI::Xaml::Input;
-using namespace Windows::UI::Xaml::Media;
-using namespace Windows::UI::Xaml::Navigation;
-
-void OperatorTextBox::OnApplyTemplate()
-{
-    this->IsEnabled = false;
-    this->IsHitTestVisible = false;
-    this->IsTapEnabled = false;
-    this->MaxLength = 50;
-    this->IsReadOnly = true;
-    this->IsRightTapEnabled = false;
-    this->IsTabStop = false;
-    auto parent = VisualTreeHelper::GetParent(this);
-    ListViewItem^ listViewItem;
-    ListView^ listView;
-    while (parent != nullptr)
-    {
-        if (listViewItem == nullptr)
-        {
-            listViewItem = dynamic_cast<ListViewItem^>(parent);
-        }
-
-        listView = dynamic_cast<ListView^>(parent);
-        if (listView != nullptr)
-        {
-            break;
-        }
-        parent = VisualTreeHelper::GetParent(parent);
-    }
-
-    if (listView != nullptr)
-    {
-        listViewItem->IsEnabled = false;
-        listViewItem->IsHitTestVisible = false;
-        listViewItem->IsTapEnabled = false;
-    }
-    TextBox::OnApplyTemplate();
-}
--- a/src/Calculator/Controls/OperatorTextBox.h
+++ b/src/Calculator/Controls/OperatorTextBox.h
@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#pragma once
-
-namespace CalculatorApp
-{
-    namespace Controls
-    {
-        public ref class OperatorTextBox sealed : public Windows::UI::Xaml::Controls::TextBox
-        {
-        public:
-            OperatorTextBox() { }
-
-        protected:
-            virtual void OnApplyTemplate() override;
-        };
-    }
-}
--- a/src/Calculator/Controls/OverflowTextBlock.cpp
+++ b/src/Calculator/Controls/OverflowTextBlock.cpp
@ -30,25 +30,38 @@ DEPENDENCY_PROPERTY_INITIALIZATION(OverflowTextBlock, TokensUpdated);

 void OverflowTextBlock::OnApplyTemplate()
 {
-    assert(((m_scrollLeft == nullptr) && (m_scrollRight == nullptr)) || ((m_scrollLeft != nullptr) && (m_scrollRight != nullptr)));
+    UnregisterEventHandlers();

-    m_expressionContainer = safe_cast<ScrollViewer^>(GetTemplateChild("expressionContainer"));
-    m_expressionContainer->ChangeView(m_expressionContainer->ExtentWidth - m_expressionContainer->ViewportWidth, nullptr, nullptr);
+    auto uiElement = GetTemplateChild("ExpressionContainer");
+    if (uiElement != nullptr)
+    {
+        m_expressionContainer = safe_cast<ScrollViewer^>(uiElement);
+        m_expressionContainer->ChangeView(m_expressionContainer->ExtentWidth - m_expressionContainer->ViewportWidth, nullptr, nullptr);
+        m_containerViewChangedToken = m_expressionContainer->ViewChanged += ref new EventHandler<ScrollViewerViewChangedEventArgs ^>(this, &OverflowTextBlock::OnViewChanged);
+    }

-    m_scrollLeft = safe_cast<Button^>(GetTemplateChild("scrollLeft"));
-    m_scrollRight = safe_cast<Button^>(GetTemplateChild("scrollRight"));
+    uiElement = GetTemplateChild("ScrollLeft");
+    if (uiElement != nullptr)
+    {
+        m_scrollLeft = safe_cast<Button^>(uiElement);
+        m_scrollLeftClickEventToken = m_scrollLeft->Click += ref new RoutedEventHandler(this, &OverflowTextBlock::OnScrollClick);
+    }

-    m_scrollLeftClickEventToken = m_scrollLeft->Click += ref new RoutedEventHandler(this, &OverflowTextBlock::OnScrollClick);
-    m_scrollRightClickEventToken = m_scrollRight->Click += ref new RoutedEventHandler(this, &OverflowTextBlock::OnScrollClick);
+    uiElement = GetTemplateChild("ScrollRight");
+    if (uiElement != nullptr)
+    {
+        m_scrollRight = safe_cast<Button^>(uiElement);
+        m_scrollRightClickEventToken = m_scrollRight->Click += ref new RoutedEventHandler(this, &OverflowTextBlock::OnScrollClick);
+    }

    m_scrollingLeft = false;
    m_scrollingRight = false;

-    auto borderContainer = safe_cast<Border^>(GetTemplateChild("expressionborder"));
-    m_pointerEnteredEventToken = borderContainer->PointerEntered += ref new PointerEventHandler(this, &OverflowTextBlock::OnPointerEntered);
-    m_pointerExitedEventToken = borderContainer->PointerExited += ref new PointerEventHandler(this, &OverflowTextBlock::OnPointerExited);
-
-    m_listView = safe_cast<ListView^>(GetTemplateChild("TokenList"));
+    uiElement = GetTemplateChild("TokenList");
+    if (uiElement != nullptr)
+    {
+        m_itemsControl = safe_cast<ItemsControl^>(uiElement);
+    }

    UpdateAllState();
 }
@ -60,18 +73,19 @@ AutomationPeer^ OverflowTextBlock::OnCreateAutomationPeer()

 void OverflowTextBlock::OnTokensUpdatedPropertyChanged(bool /*oldValue*/, bool newValue)
 {
-    if ((m_listView != nullptr) && (newValue))
+    if (m_expressionContainer != nullptr && newValue)
    {
-        unsigned int tokenCount = m_listView->Items->Size;
-        if (tokenCount > 0)
-        {
-            m_listView->UpdateLayout();
-            m_listView->ScrollIntoView(m_listView->Items->GetAt(tokenCount - 1));
-            m_expressionContainer->ChangeView(m_expressionContainer->ExtentWidth - m_expressionContainer->ViewportWidth, nullptr, nullptr);
-        }
+        m_expressionContainer->UpdateLayout();
+        m_expressionContainer->ChangeView(m_expressionContainer->ScrollableWidth, nullptr, nullptr, true);
    }
-    AutomationProperties::SetAccessibilityView(this,
-        m_listView != nullptr && m_listView->Items->Size > 0 ? AccessibilityView::Control : AccessibilityView::Raw);
+    auto newIsAccessibilityViewControl = m_itemsControl != nullptr && m_itemsControl->Items->Size > 0;
+    if (m_isAccessibilityViewControl != newIsAccessibilityViewControl)
+    {
+        m_isAccessibilityViewControl = newIsAccessibilityViewControl;
+        AutomationProperties::SetAccessibilityView(this,
+            newIsAccessibilityViewControl ? AccessibilityView::Control : AccessibilityView::Raw);
+    }
+    UpdateScrollButtons();
 }

 void OverflowTextBlock::UpdateAllState()
@ -93,7 +107,7 @@ void OverflowTextBlock::UpdateVisualState()

 void OverflowTextBlock::ScrollLeft()
 {
-    if (m_expressionContainer->HorizontalOffset > 0)
+    if (m_expressionContainer != nullptr && m_expressionContainer->HorizontalOffset > 0)
    {
        m_scrollingLeft = true;
        double offset = m_expressionContainer->HorizontalOffset - (scrollRatio * m_expressionContainer->ViewportWidth);
@ -105,7 +119,7 @@ void OverflowTextBlock::ScrollLeft()

 void OverflowTextBlock::ScrollRight()
 {
-    if (m_expressionContainer->HorizontalOffset < m_expressionContainer->ExtentWidth - m_expressionContainer->ViewportWidth)
+    if (m_expressionContainer != nullptr && m_expressionContainer->HorizontalOffset < m_expressionContainer->ExtentWidth - m_expressionContainer->ViewportWidth)
    {
        m_scrollingRight = true;
        double offset = m_expressionContainer->HorizontalOffset + (scrollRatio * m_expressionContainer->ViewportWidth);
@ -128,26 +142,15 @@ void OverflowTextBlock::OnScrollClick(_In_ Object^ sender, _In_ RoutedEventArgs^
    }
 }

-void OverflowTextBlock::OnPointerEntered(_In_ Object^, _In_ PointerRoutedEventArgs^ e)
-{
-    if (e->Pointer->PointerDeviceType == PointerDeviceType::Mouse)
-    {
-        UpdateScrollButtons();
-    }
-}
-
-void OverflowTextBlock::OnPointerExited(_In_ Object^, _In_ PointerRoutedEventArgs^ e)
-{
-    if (e->Pointer->PointerDeviceType == PointerDeviceType::Mouse)
-    {
-        UpdateScrollButtons();
-    }
-}
-
 void OverflowTextBlock::UpdateScrollButtons()
 {
+    if (m_itemsControl == nullptr || m_expressionContainer == nullptr)
+    {
+        return;
+    }
+
    // When the width is smaller than the container, don't show any
-    if (m_listView->ActualWidth <= m_expressionContainer->ActualWidth)
+    if (m_itemsControl->ActualWidth <= m_expressionContainer->ActualWidth)
    {
        ShowHideScrollButtons(::Visibility::Collapsed, ::Visibility::Collapsed);
    }
@ -163,7 +166,10 @@ void OverflowTextBlock::UpdateScrollButtons()
        if (m_scrollingLeft)
        {
            m_scrollingLeft = false;
-            m_scrollRight->Focus(::FocusState::Programmatic);
+            if (m_scrollRight != nullptr)
+            {
+                m_scrollRight->Focus(::FocusState::Programmatic);
+            }
        }
    }
    else // Width is larger than the container and right most part of the number is shown. Should be able to scroll left.
@ -172,7 +178,10 @@ void OverflowTextBlock::UpdateScrollButtons()
        if (m_scrollingRight)
        {
            m_scrollingRight = false;
-            m_scrollLeft->Focus(::FocusState::Programmatic);
+            if (m_scrollLeft != nullptr)
+            {
+                m_scrollLeft->Focus(::FocusState::Programmatic);
+            }
        }
    }
 }
@ -199,12 +208,13 @@ void OverflowTextBlock::UnregisterEventHandlers()
        m_scrollRight->Click -= m_scrollRightClickEventToken;
    }

-    auto borderContainer = safe_cast<Border^>(GetTemplateChild("expressionborder"));
-
-    // Adding an extra check, in case the returned template is null
-    if (borderContainer != nullptr)
+    if (m_expressionContainer != nullptr)
    {
-        borderContainer->PointerEntered -= m_pointerEnteredEventToken;
-        borderContainer->PointerExited -= m_pointerExitedEventToken;
+        m_expressionContainer->ViewChanged -= m_containerViewChangedToken;
    }
 }
+
+void OverflowTextBlock::OnViewChanged(_In_opt_ Object^ /*sender*/, _In_opt_ ScrollViewerViewChangedEventArgs^ /*args*/)
+{
+    UpdateScrollButtons();
+}
--- a/src/Calculator/Controls/OverflowTextBlock.h
+++ b/src/Calculator/Controls/OverflowTextBlock.h
@ -34,6 +34,7 @@ namespace CalculatorApp
            void OnPointerExited(_In_ Platform::Object^ sender, _In_ Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e);
            void ShowHideScrollButtons(Windows::UI::Xaml::Visibility vLeft, Windows::UI::Xaml::Visibility vRight);
            void OnTokensUpdatedPropertyChanged(bool oldValue, bool newValue);
+            void OnViewChanged(_In_opt_ Platform::Object ^sender, _In_opt_ Windows::UI::Xaml::Controls::ScrollViewerViewChangedEventArgs ^args);

            void UpdateVisualState();
            void UpdateExpressionState();
@ -44,15 +45,15 @@ namespace CalculatorApp
            double scrollRatio = 0.7;
            bool m_scrollingLeft;
            bool m_scrollingRight;
-            Windows::UI::Xaml::Controls::ListView^ m_listView;
+            bool m_isAccessibilityViewControl;
+            Windows::UI::Xaml::Controls::ItemsControl^ m_itemsControl;
            Windows::UI::Xaml::Controls::ScrollViewer^ m_expressionContainer;
            Windows::UI::Xaml::Controls::Button^ m_scrollLeft;
            Windows::UI::Xaml::Controls::Button^ m_scrollRight;

            Windows::Foundation::EventRegistrationToken m_scrollLeftClickEventToken;
            Windows::Foundation::EventRegistrationToken m_scrollRightClickEventToken;
-            Windows::Foundation::EventRegistrationToken m_pointerEnteredEventToken;
-            Windows::Foundation::EventRegistrationToken m_pointerExitedEventToken;
+            Windows::Foundation::EventRegistrationToken m_containerViewChangedToken;
        };
    }
 }
--- a/src/Calculator/Converters/ExpressionItemContainerStyle.cpp
+++ b/src/Calculator/Converters/ExpressionItemContainerStyle.cpp
@ -1,44 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#include "pch.h"
-#include "ExpressionItemContainerStyle.h"
-#include "CalcViewModel/Common/DisplayExpressionToken.h"
-
-using namespace CalculatorApp::Common;
-
-namespace CalculatorApp
-{
-    namespace Converters
-    {
-        Windows::UI::Xaml::Style^ ExpressionItemContainerStyle::SelectStyleCore(Platform::Object^ item, Windows::UI::Xaml::DependencyObject^ container)
-        {
-            DisplayExpressionToken^ token = dynamic_cast<DisplayExpressionToken^>(item);
-            if (token != nullptr)
-            {
-                Common::TokenType type = token->Type;
-
-                switch (type)
-                {
-                case TokenType::Operator:
-                    if (token->IsTokenEditable)
-                    {
-                        return m_editableOperatorStyle;
-                    }
-                    else
-                    {
-                        return m_nonEditableOperatorStyle;
-                    }
-                case TokenType::Operand:
-                    return m_operandStyle;
-                case TokenType::Separator:
-                    return m_separatorStyle;
-                default:
-                    throw ref new Platform::Exception(E_FAIL, L"Invalid token type");
-                }
-            }
-
-            return m_separatorStyle;
-        }
-    }
-}
--- a/src/Calculator/Converters/ExpressionItemContainerStyle.h
+++ b/src/Calculator/Converters/ExpressionItemContainerStyle.h
@ -1,71 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#pragma once
-
-namespace CalculatorApp
-{
-    namespace Converters
-    {
-        [Windows::UI::Xaml::Data::Bindable]
-        public ref class ExpressionItemContainerStyle sealed : public Windows::UI::Xaml::Controls::StyleSelector
-        {
-        public:
-            virtual Windows::UI::Xaml::Style^ SelectStyleCore(Platform::Object^ item, Windows::UI::Xaml::DependencyObject^ container) override;
-
-            property Windows::UI::Xaml::Style^ EditableOperatorStyle
-            {
-                Windows::UI::Xaml::Style^ get()
-                {
-                    return m_editableOperatorStyle;
-                }
-                void set(Windows::UI::Xaml::Style^ val)
-                {
-                    m_editableOperatorStyle = val;
-                }
-            }
-
-            property Windows::UI::Xaml::Style^ OperandStyle
-            {
-                Windows::UI::Xaml::Style^ get()
-                {
-                    return m_operandStyle;
-                }
-                void set(Windows::UI::Xaml::Style^ val)
-                {
-                    m_operandStyle = val;
-                }
-            }
-
-            property Windows::UI::Xaml::Style^ SeparatorStyle
-            {
-                Windows::UI::Xaml::Style^ get()
-                {
-                    return m_separatorStyle;
-                }
-                void set(Windows::UI::Xaml::Style^ val)
-                {
-                    m_separatorStyle = val;
-                }
-            }
-
-            property Windows::UI::Xaml::Style^ NonEditableOperatorStyle
-            {
-                Windows::UI::Xaml::Style^ get()
-                {
-                    return m_nonEditableOperatorStyle;
-                }
-                void set(Windows::UI::Xaml::Style^ val)
-                {
-                    m_nonEditableOperatorStyle = val;
-                }
-            }
-
-        private:
-            Windows::UI::Xaml::Style^ m_editableOperatorStyle;
-            Windows::UI::Xaml::Style^ m_nonEditableOperatorStyle;
-            Windows::UI::Xaml::Style^ m_operandStyle;
-            Windows::UI::Xaml::Style^ m_separatorStyle;
-        };
-    }
-}
--- a/src/Calculator/Resources/am-ET/Resources.resw
+++ b/src/Calculator/Resources/am-ET/Resources.resw
@ -901,10 +901,7 @@
    <value>የግራ ቅንፍ</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>የግራ ቅንፍ፣ የክፍት ቅንፍ ቁጥር %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>የቀኝ ቅንፍ</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/ar-SA/Resources.resw
+++ b/src/Calculator/Resources/ar-SA/Resources.resw
@ -901,10 +901,7 @@
    <value>أقواس يسرى</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>القوس الأيسر، عدد الأقواس المفتوحة %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>أقواس يمنى</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/az-Latn-AZ/Resources.resw
+++ b/src/Calculator/Resources/az-Latn-AZ/Resources.resw
@ -901,10 +901,7 @@
    <value>Sol mötərizə</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>Sol mötərizə, açıq mötərizənin sayı %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Sağ mötərizə</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/be-BY/Resources.resw
+++ b/src/Calculator/Resources/be-BY/Resources.resw
@ -901,10 +901,7 @@
    <value>Левая дужка</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>Левая дужка, пачатак адліку дужак (%1)</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Правая дужка</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/bg-BG/Resources.resw
+++ b/src/Calculator/Resources/bg-BG/Resources.resw
@ -901,10 +901,7 @@
    <value>Лява скоба</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>Лява скоба, брой на отваряща скоба %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Дясна скоба</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/ca-ES/Resources.resw
+++ b/src/Calculator/Resources/ca-ES/Resources.resw
@ -901,10 +901,7 @@
    <value>Parèntesi d'obertura</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>Parèntesi d'obertura, recompte de parèntesis d'obertura %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Parèntesi de tancament</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/cs-CZ/Resources.resw
+++ b/src/Calculator/Resources/cs-CZ/Resources.resw
@ -901,10 +901,7 @@
    <value>Levá závorka</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>Levá závorka, počet otevřených závorek %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Pravá závorka</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/da-DK/Resources.resw
+++ b/src/Calculator/Resources/da-DK/Resources.resw
@ -901,10 +901,7 @@
    <value>Venstreparentes</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>Venstre parentes, åben parentes antal %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Højreparentes</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/de-DE/Resources.resw
+++ b/src/Calculator/Resources/de-DE/Resources.resw
@ -901,10 +901,7 @@
    <value>Öffnende Klammer</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>Runde Klammer links, Anzahl der öffnenden Klammern: %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Schließende Klammer</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/el-GR/Resources.resw
+++ b/src/Calculator/Resources/el-GR/Resources.resw
@ -901,10 +901,7 @@
    <value>Αριστερή παρένθεση</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>Αριστερή παρένθεση, πλήθος ανοιχτών παρενθέσεων %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Δεξιά παρένθεση</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/en-GB/Resources.resw
+++ b/src/Calculator/Resources/en-GB/Resources.resw
@ -901,10 +901,7 @@
    <value>Left parenthesis</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>Left parenthesis, open parenthesis count %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Right parenthesis</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@ -3379,4 +3379,12 @@
    <value>Microsoft Services Agreement</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+  <data name="UnitAbbreviation_Pyeong" xml:space="preserve">
+    <value>Pyeong</value>
+    <comment>An abbreviation for a measurement unit of area.</comment>
+  </data>
+  <data name="UnitName_Pyeong" xml:space="preserve">
+    <value>Pyeong</value>
+    <comment>A measurement unit for area.</comment>
+  </data>
+</root>
--- a/src/Calculator/Resources/es-ES/Resources.resw
+++ b/src/Calculator/Resources/es-ES/Resources.resw
@ -901,10 +901,7 @@
    <value>Paréntesis de apertura</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>Paréntesis de apertura, número de paréntesis abiertos %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Paréntesis de cierre</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/src/Calculator/Resources/es-MX/Resources.resw
+++ b/src/Calculator/Resources/es-MX/Resources.resw
@ -901,10 +901,7 @@
    <value>Paréntesis de apertura</value>
    <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
  </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
-    <value>Abrir paréntesis, recuento de paréntesis abiertos %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
+  
  <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Paréntesis de cierre</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
--- a/Show more
+++ b/Show more